summaryrefslogtreecommitdiffstats
path: root/packages/DefaultContainerService
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2015-07-06 19:01:41 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-06 19:01:41 +0000
commitccde254cf91ff17130e2356f0169b6cff63c0827 (patch)
tree8f73773e434a7b2ae91aced1e714643eb75774bc /packages/DefaultContainerService
parent67ba36163ae0e02454c0a3c48e4b9ce5e4625aa1 (diff)
parent0cae3e9ebfb5d1050e28f57542eaaaa56fb96a33 (diff)
downloadframeworks_base-ccde254cf91ff17130e2356f0169b6cff63c0827.zip
frameworks_base-ccde254cf91ff17130e2356f0169b6cff63c0827.tar.gz
frameworks_base-ccde254cf91ff17130e2356f0169b6cff63c0827.tar.bz2
am 0cae3e9e: am 7dfe0f83: am 7fd3c296: Merge "Permission to view shared storage for all users." into mnc-dev
* commit '0cae3e9ebfb5d1050e28f57542eaaaa56fb96a33': Permission to view shared storage for all users.
Diffstat (limited to 'packages/DefaultContainerService')
-rw-r--r--packages/DefaultContainerService/AndroidManifest.xml4
1 files changed, 2 insertions, 2 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">