summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmit Mahajan <amitmahajan@google.com>2015-06-26 22:31:49 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-06-26 22:31:49 +0000
commit23444e76d2480d2537c2b6418f0c6c89c8cdb590 (patch)
treeae8bca4e1ec33c1ab0333aeed849548d32341659
parent765255b41229553842da855b8e5d9dfa87cf8e2b (diff)
parenteee86342713a7c89c30933a22f8b7e190d3af10f (diff)
downloadframeworks_base-23444e76d2480d2537c2b6418f0c6c89c8cdb590.zip
frameworks_base-23444e76d2480d2537c2b6418f0c6c89c8cdb590.tar.gz
frameworks_base-23444e76d2480d2537c2b6418f0c6c89c8cdb590.tar.bz2
am eee86342: am 9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit 'eee86342713a7c89c30933a22f8b7e190d3af10f': DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
-rw-r--r--core/res/AndroidManifest.xml5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index bd1f25f..fa1ac01 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -1132,6 +1132,11 @@
android:description="@string/permdesc_bind_call_service"
android:label="@string/permlab_bind_call_service" />
+ <!-- Allows an application to receive STK related commands.
+ @hide -->
+ <permission android:name="android.permission.RECEIVE_STK_COMMANDS"
+ android:protectionLevel="system|signature" />
+
<!-- ================================== -->
<!-- Permissions for sdcard interaction -->
<!-- ================================== -->