summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Doug Zongker <dougz@android.com> 2013-01-29 17:11:48 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2013-01-29 17:11:48 -0800
commit7a8a1799ef36df5d2df740adc2568fe4b30fa617 (patch)
tree26752637bd6dbec5a77f6f052262f7e1943907ee
parent625f4a0be0d2aaf7cad5d5ab1a4e24f3ef807316 (diff)
parent58395e71ce7e99f8149eebbf39db77798165a539 (diff)
am 58395e71: am 9c4ba4fe: am b616f0c2: add android.permission.LOOP_RADIO for access to loop radio device
# Via Android Git Automerger (2) and Doug Zongker (1) * commit '58395e71ce7e99f8149eebbf39db77798165a539': add android.permission.LOOP_RADIO for access to loop radio device
-rw-r--r--core/res/AndroidManifest.xml6
-rw-r--r--data/etc/platform.xml4
2 files changed, 10 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index aafc4bf9906d..558080c7a494 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 -->
<!-- ================================== -->
diff --git a/data/etc/platform.xml b/data/etc/platform.xml
index 83ecdd95b384..cf04b5ca81d1 100644
--- a/data/etc/platform.xml
+++ b/data/etc/platform.xml
@@ -106,6 +106,10 @@
<group gid="net_bw_acct" />
</permission>
+ <permission name="android.permission.LOOP_RADIO" >
+ <group gid="loop_radio" />
+ </permission>
+
<!-- ================================================================== -->
<!-- ================================================================== -->
<!-- ================================================================== -->