diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2015-07-06 17:58:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-06 17:59:11 +0000 |
| commit | 7fd3c296f1991e321e4c69a5e7f918cc3d252625 (patch) | |
| tree | f14f0f3456a84ba10969ba31ecf64721643c55a4 /packages | |
| parent | 6d842f63a00e34edb583f9fdd6f233c20dcd00f2 (diff) | |
| parent | 32e80d7588720bdc9f8a3e961ac4566d7c80b2b9 (diff) | |
| download | frameworks_base-7fd3c296f1991e321e4c69a5e7f918cc3d252625.zip frameworks_base-7fd3c296f1991e321e4c69a5e7f918cc3d252625.tar.gz frameworks_base-7fd3c296f1991e321e4c69a5e7f918cc3d252625.tar.bz2 | |
Merge "Permission to view shared storage for all users." into mnc-dev
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/DefaultContainerService/AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | packages/SystemUI/AndroidManifest.xml | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/packages/DefaultContainerService/AndroidManifest.xml b/packages/DefaultContainerService/AndroidManifest.xml index 14777a9..6a72d83 100644 --- a/packages/DefaultContainerService/AndroidManifest.xml +++ b/packages/DefaultContainerService/AndroidManifest.xml @@ -5,10 +5,10 @@ <uses-permission android:name="android.permission.ASEC_DESTROY"/> <uses-permission android:name="android.permission.ASEC_MOUNT_UNMOUNT"/> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> - <!-- Used to improve MeasureUtils performance on emulated storage --> + <!-- Used to improve MeasureUtils performance on emulated storage, and to + view storage for all users --> <uses-permission android:name="android.permission.WRITE_MEDIA_STORAGE" /> <uses-permission android:name="android.permission.ACCESS_CACHE_FILESYSTEM" /> - <uses-permission android:name="android.permission.ACCESS_ALL_EXTERNAL_STORAGE" /> <application android:label="@string/service_name" android:allowBackup="false"> diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index 7c56d63..ea032b3 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -25,7 +25,8 @@ <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> - <uses-permission android:name="android.permission.ACCESS_ALL_EXTERNAL_STORAGE" /> + <!-- Used to read storage for all users --> + <uses-permission android:name="android.permission.WRITE_MEDIA_STORAGE" /> <uses-permission android:name="android.permission.WAKE_LOCK" /> <uses-permission android:name="android.permission.INJECT_EVENTS" /> |