diff options
| author | Yorke Lee <yorkelee@google.com> | 2015-06-04 16:34:53 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-04 16:34:55 +0000 |
| commit | 13d6e4b33b1c34c256d62837a0cda55fae578884 (patch) | |
| tree | 8c1c47f7c7c620ff74a3b9c06ead11fe45938f79 /packages | |
| parent | cb9400aa23b81f12d8af198187fc799d6bcf164a (diff) | |
| parent | adb53b35cc99e1e98bc4c640d534fa00d44ebe31 (diff) | |
| download | frameworks_base-13d6e4b33b1c34c256d62837a0cda55fae578884.zip frameworks_base-13d6e4b33b1c34c256d62837a0cda55fae578884.tar.gz frameworks_base-13d6e4b33b1c34c256d62837a0cda55fae578884.tar.bz2 | |
Merge changes Ia219ff78,I3fd52525 into mnc-dev
* changes:
Add phone permissions to Shell
Add adb shell command to register/unregister phone accounts
Diffstat (limited to 'packages')
| -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 |