summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmit Mahajan <amitmahajan@google.com>2015-06-10 17:02:39 -0700
committerThe Android Automerger <android-build@google.com>2015-07-27 12:29:59 -0700
commita0e574d7766ccfa374f337fea85dd616d4046674 (patch)
tree64b5e745ade51a3ed8813938b536f674ea4ddfe8
parentd42d72cb8a4a07b26f6e894d79bc24f50ba76efd (diff)
downloadbase-linaro_android_5.1.tar.gz
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.android-5.1.1_r13linaro_android_5.1
Bug: 21697171 Change-Id: I7649c7341428194963ac74e9ae622dfa76ea738b
-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 ccdb5db3d647..baa4e24b1f3c 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 -->
<!-- ================================== -->