summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmit Mahajan <amitmahajan@google.com>2015-06-26 22:03:10 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-06-26 22:03:10 +0000
commit895eb134751ec1495baa30362a514275624e5843 (patch)
tree5d88ea36e9f443ee7c52bb2f734a82853c5cae6f
parent1f33bdad98dd5138f887642d39c9495e1d7df14b (diff)
parent90224355cd6bd54fa7a9ec30c1cecc573104a3e3 (diff)
downloadframeworks_base-895eb134751ec1495baa30362a514275624e5843.zip
frameworks_base-895eb134751ec1495baa30362a514275624e5843.tar.gz
frameworks_base-895eb134751ec1495baa30362a514275624e5843.tar.bz2
am 90224355: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit '90224355cd6bd54fa7a9ec30c1cecc573104a3e3': 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 ccdb5db..baa4e24 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -1333,6 +1333,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 -->
<!-- ================================== -->