summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmit Mahajan <amitmahajan@google.com>2015-06-26 22:35:46 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-06-26 22:35:46 +0000
commitd98e7c1df774eb86a67310f5cbc0dbdd91f33c19 (patch)
tree25f621a2f3472ec7a243788da77bf005ea6d8a65
parent9a3eacbe9ce0e6a65429c721b6f4e60a28dbdaab (diff)
parent7278b04383cb6c01c2fbb184c560875ab709dea5 (diff)
downloadframeworks_base-d98e7c1df774eb86a67310f5cbc0dbdd91f33c19.zip
frameworks_base-d98e7c1df774eb86a67310f5cbc0dbdd91f33c19.tar.gz
frameworks_base-d98e7c1df774eb86a67310f5cbc0dbdd91f33c19.tar.bz2
am 7278b043: am 895eb134: am 90224355: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit '7278b04383cb6c01c2fbb184c560875ab709dea5': 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 75ba16b..df51149 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 -->
<!-- ================================== -->