diff options
| author | Yorke Lee <yorkelee@google.com> | 2015-06-04 18:42:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-04 18:42:23 +0000 |
| commit | 823f85c51284b9fe5098688746e48b1efd13a3e5 (patch) | |
| tree | 258998c732e4e74e089f9134f18d97faa1880f26 /packages/Shell | |
| parent | 7abc645200ed6b2d7f9e90e9f2ff169b84518305 (diff) | |
| parent | 13d6e4b33b1c34c256d62837a0cda55fae578884 (diff) | |
| download | frameworks_base-823f85c51284b9fe5098688746e48b1efd13a3e5.zip frameworks_base-823f85c51284b9fe5098688746e48b1efd13a3e5.tar.gz frameworks_base-823f85c51284b9fe5098688746e48b1efd13a3e5.tar.bz2 | |
am 13d6e4b3: Merge changes Ia219ff78,I3fd52525 into mnc-dev
* commit '13d6e4b33b1c34c256d62837a0cda55fae578884':
Add phone permissions to Shell
Add adb shell command to register/unregister phone accounts
Diffstat (limited to 'packages/Shell')
| -rw-r--r-- | packages/Shell/AndroidManifest.xml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index fd0ba73..640fb29 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -25,6 +25,7 @@ <!-- Standard permissions granted to the shell. --> <uses-permission android:name="android.permission.SEND_SMS" /> <uses-permission android:name="android.permission.CALL_PHONE" /> + <uses-permission android:name="android.permission.READ_PHONE_STATE" /> <uses-permission android:name="android.permission.READ_CONTACTS" /> <uses-permission android:name="android.permission.WRITE_CONTACTS" /> <uses-permission android:name="android.permission.READ_CALENDAR" /> @@ -97,6 +98,10 @@ <uses-permission android:name="android.permission.CHANGE_APP_IDLE_STATE" /> <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" /> <uses-permission android:name="android.permission.MOUNT_FORMAT_FILESYSTEMS" /> + <uses-permission android:name="android.permission.MODIFY_PHONE_STATE" /> + <uses-permission android:name="android.permission.REGISTER_CALL_PROVIDER" /> + <uses-permission android:name="android.permission.REGISTER_CONNECTION_MANAGER" /> + <uses-permission android:name="android.permission.REGISTER_SIM_SUBSCRIPTION" /> <application android:label="@string/app_label"> <provider |