From 40a91a2884333e48aacf266fde53960e03fa1cc4 Mon Sep 17 00:00:00 2001
From: Matthew Xie <mattx@google.com>
Date: Mon, 20 May 2013 14:22:01 -0700
Subject: [PATCH] Add permission for bluetooth app in non-primary users

bug 8954114
Change-Id: Id6a42f5a5beefa22c3cc8eecfb39a2222017a3b4
---
 init/property_service.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/init/property_service.c b/init/property_service.c
index 62b6c3dfd..45e9e3722 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>
@@ -271,12 +272,19 @@ static int check_control_perms(const char *name, unsigned int uid, unsigned int
 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) {