summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmit Mahajan <amitmahajan@google.com>2015-06-26 22:55:47 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-06-26 22:55:47 +0000
commit1573d8efb2ac6a1a2e2a057041200633df2a9717 (patch)
tree0131d80a7bff63ac8ca8b2c291431dbfdd1469bf
parent76e42bdd05f6defa283f9df12966928328680445 (diff)
parentd98e7c1df774eb86a67310f5cbc0dbdd91f33c19 (diff)
downloadframeworks_base-1573d8efb2ac6a1a2e2a057041200633df2a9717.zip
frameworks_base-1573d8efb2ac6a1a2e2a057041200633df2a9717.tar.gz
frameworks_base-1573d8efb2ac6a1a2e2a057041200633df2a9717.tar.bz2
am d98e7c1d: am 7278b043: am 895eb134: am 90224355: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit 'd98e7c1df774eb86a67310f5cbc0dbdd91f33c19': 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 ad2faf8..ab8df0c 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -1337,6 +1337,11 @@
android:description="@string/permdesc_control_incall_experience"
android:label="@string/permlab_control_incall_experience" />
+ <!-- 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 -->
<!-- ================================== -->