diff options
| author | Amit Mahajan <amitmahajan@google.com> | 2015-06-11 20:26:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-11 20:26:41 +0000 |
| commit | 02184244dcd0149252676bbf24c6d9a5c9ebfd5b (patch) | |
| tree | 0fdd48ff163582a19b80f5d9e589074dc9c2cacb | |
| parent | dfd93c69c08bf0bd0c7a631b27c50a51096c9727 (diff) | |
| parent | 59acd140b6e3165767ec5a11a16779bc9e220def (diff) | |
| download | frameworks_base-02184244dcd0149252676bbf24c6d9a5c9ebfd5b.zip frameworks_base-02184244dcd0149252676bbf24c6d9a5c9ebfd5b.tar.gz frameworks_base-02184244dcd0149252676bbf24c6d9a5c9ebfd5b.tar.bz2 | |
Merge "Change to add STK_PERMISSION for stk related commands." into mnc-dev
| -rw-r--r-- | core/res/AndroidManifest.xml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 54123f5..6d0a902 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -1204,12 +1204,16 @@ <permission android:name="android.permission.BIND_TELECOM_CONNECTION_SERVICE" android:protectionLevel="system|signature" /> - <!-- @SystemApi Allows an application to control the in-call experience. @hide --> <permission android:name="android.permission.CONTROL_INCALL_EXPERIENCE" android:protectionLevel="system|signature" /> + <!-- 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 --> <!-- ================================== --> |