diff options
| author | Amit Mahajan <amitmahajan@google.com> | 2015-06-10 17:02:39 -0700 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-10-18 01:41:56 +0200 |
| commit | bb35eca0884d71ba863044f2bb71623e83a419cc (patch) | |
| tree | 4333b4fe5dd423f407a0ec683be166581ed616f8 | |
| parent | 52878bcea5fe5e2743a96ed9feee64827e42ecc8 (diff) | |
| download | frameworks_base-bb35eca0884d71ba863044f2bb71623e83a419cc.zip frameworks_base-bb35eca0884d71ba863044f2bb71623e83a419cc.tar.gz frameworks_base-bb35eca0884d71ba863044f2bb71623e83a419cc.tar.bz2 | |
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Bug: 21697171
Change-Id: I7649c7341428194963ac74e9ae622dfa76ea738b
Conflicts:
core/res/AndroidManifest.xml
| -rw-r--r-- | core/res/AndroidManifest.xml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index b434294..319550b 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -1025,6 +1025,11 @@ android:description="@string/permdesc_use_sip" android:label="@string/permlab_use_sip" /> + <!-- 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 --> <!-- ================================== --> |