summaryrefslogtreecommitdiffstats
path: root/data
diff options
context:
space:
mode:
authorMatthew Xie <mattx@google.com>2012-10-04 23:21:33 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-04 23:21:34 -0700
commitd21b483904057212ab1654b8ef606d41f2d3fe46 (patch)
tree937d2de9cc5a786bee99aedbe208da71dc83a86d /data
parentefd7b26797cc64be0d1156f7ba15b5c6b99597e0 (diff)
parentfca9d63635d9603c318a089397b23c17682453e3 (diff)
downloadframeworks_base-d21b483904057212ab1654b8ef606d41f2d3fe46.zip
frameworks_base-d21b483904057212ab1654b8ef606d41f2d3fe46.tar.gz
frameworks_base-d21b483904057212ab1654b8ef606d41f2d3fe46.tar.bz2
Merge "Add multi user support for bluetooth" into jb-mr1-dev
Diffstat (limited to 'data')
-rw-r--r--data/etc/platform.xml5
1 files changed, 5 insertions, 0 deletions
diff --git a/data/etc/platform.xml b/data/etc/platform.xml
index a19b9b4..13d1791 100644
--- a/data/etc/platform.xml
+++ b/data/etc/platform.xml
@@ -42,6 +42,10 @@
<group gid="net_bt" />
</permission>
+ <permission name="android.permission.BLUETOOTH_STACK" >
+ <group gid="net_bt_stack" />
+ </permission>
+
<permission name="android.permission.NET_TUNNELING" >
<group gid="vpn" />
</permission>
@@ -176,6 +180,7 @@
<assign-permission name="android.permission.INTERACT_ACROSS_USERS" uid="shell" />
<assign-permission name="android.permission.INTERACT_ACROSS_USERS_FULL" uid="shell" />
<assign-permission name="android.permission.MANAGE_USERS" uid="shell" />
+ <assign-permission name="android.permission.BLUETOOTH_STACK" uid="shell" />
<assign-permission name="android.permission.MODIFY_AUDIO_SETTINGS" uid="media" />
<assign-permission name="android.permission.ACCESS_DRM" uid="media" />