diff options
| author | Amit Mahajan <amitmahajan@google.com> | 2015-06-11 10:51:05 -0700 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-10-18 01:32:08 +0200 |
| commit | c5ac31f195cd7aaaffd094be388cf11bcd7fb834 (patch) | |
| tree | 89fa33b7c5138bfad65b1c6a6914bccbe645d7b6 | |
| parent | fac65f50fbe296e71e3316cf31afadbf99f242de (diff) | |
| download | packages_apps_Stk-c5ac31f195cd7aaaffd094be388cf11bcd7fb834.zip packages_apps_Stk-c5ac31f195cd7aaaffd094be388cf11bcd7fb834.tar.gz packages_apps_Stk-c5ac31f195cd7aaaffd094be388cf11bcd7fb834.tar.bz2 | |
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Bug: 21697171
Change-Id: I7649c7341428194963ac74e9ae622dfa76ea738b
Conflicts:
AndroidManifest.xml
| -rw-r--r-- | AndroidManifest.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 994abdb..b12e608 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -23,6 +23,7 @@ <original-package android:name="com.android.stk" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> + <uses-permission android:name="android.permission.RECEIVE_STK_COMMANDS" /> <application android:icon="@drawable/ic_launcher_sim_toolkit" android:label="@string/app_name" |