commit cd07446afea9a3e5090eb9a92597794f37f85130
author The Android Automerger <android-build@google.com> Thu May 23 05:55:39 2013 -0700
committer The Android Automerger <android-build@google.com> Thu May 23 05:55:39 2013 -0700
tree 13f8b2d2dc35dec034d634e1447d060677a6b55f
parent 7e72349865db83d62f98eec8bca4b170712fe0e0
parent 149cbfdafe6e5a17202994609cd9c248fbee5e36

merge in jb-mr2-release history after reset to jb-mr2-dev

init/property_service.c

diff --git a/init/property_service.c b/init/property_service.c
index 5780001..e9cf1bb 100755
--- a/init/property_service.c
+++ b/init/property_service.c
@@ -27,6 +27,7 @@
 
 #include <cutils/misc.h>
 #include <cutils/sockets.h>
+#include <cutils/multiuser.h>
 
 #define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_
 #include <sys/_system_properties.h>
@@ -270,12 +271,19 @@
 static int check_perms(const char *name, unsigned int uid, unsigned int gid, char *sctx)
 {
     int i;
+    unsigned int app_id;
+
     if(!strncmp(name, "ro.", 3))
         name +=3;
 
     if (uid == 0)
         return check_mac_perms(name, sctx);
 
+    app_id = multiuser_get_app_id(uid);
+    if (app_id == AID_BLUETOOTH) {
+        uid = app_id;
+    }
+
     for (i = 0; property_perms[i].prefix; i++) {
         if (strncmp(property_perms[i].prefix, name,
                     strlen(property_perms[i].prefix)) == 0) {