summaryrefslogtreecommitdiffstats
path: root/core/res
diff options
context:
space:
mode:
authorDoug Zongker <dougz@android.com>2013-01-29 17:09:03 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-01-29 17:09:03 -0800
commit58395e71ce7e99f8149eebbf39db77798165a539 (patch)
tree08b15f800ce90474b723c1cb83a9930b980954e1 /core/res
parentd4d9364019ed071509213b9ce772f4a5904d2847 (diff)
parent9c4ba4fe752b131b01aa402389c96eb8f24764b8 (diff)
downloadframeworks_base-58395e71ce7e99f8149eebbf39db77798165a539.zip
frameworks_base-58395e71ce7e99f8149eebbf39db77798165a539.tar.gz
frameworks_base-58395e71ce7e99f8149eebbf39db77798165a539.tar.bz2
am 9c4ba4fe: am b616f0c2: add android.permission.LOOP_RADIO for access to loop radio device
# Via Android Git Automerger (1) and Doug Zongker (1) * commit '9c4ba4fe752b131b01aa402389c96eb8f24764b8': add android.permission.LOOP_RADIO for access to loop radio device
Diffstat (limited to 'core/res')
-rw-r--r--core/res/AndroidManifest.xml6
1 files changed, 6 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index aafc4bf..558080c 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -690,6 +690,12 @@
android:permissionGroup="android.permission-group.NETWORK"
android:protectionLevel="signature|system" />
+ <!-- Allows access to the loop radio (Android@Home mesh network) device.
+ @hide -->
+ <permission android:name="android.permission.LOOP_RADIO"
+ android:permissionGroup="android.permission-group.NETWORK"
+ android:protectionLevel="signature|system" />
+
<!-- ================================== -->
<!-- Permissions for accessing accounts -->
<!-- ================================== -->