summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmit Mahajan <amitmahajan@google.com>2015-06-26 22:03:46 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-06-26 22:03:46 +0000
commit853c61788387c38c1103f26b1c8c028da5676776 (patch)
treeacd63d7e6b94c3a34298d16ec248aa0e9d3230e0
parent48b38452b0454a1398d01a5df9fe949e2febdeef (diff)
parent791dd2c67466d2d9dafe58b1258e7718e3f30bc0 (diff)
downloadframeworks_base-853c61788387c38c1103f26b1c8c028da5676776.zip
frameworks_base-853c61788387c38c1103f26b1c8c028da5676776.tar.gz
frameworks_base-853c61788387c38c1103f26b1c8c028da5676776.tar.bz2
am 791dd2c6: DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
* commit '791dd2c67466d2d9dafe58b1258e7718e3f30bc0': 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 15b56c3..b5baef8 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -1293,6 +1293,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 -->
<!-- ================================== -->