diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2013-04-11 15:19:38 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-11 15:19:38 -0700 |
| commit | ce6d3ed6120e79d7a663dac3a5aa1ffe02a6a23e (patch) | |
| tree | 81c5c4be849443d134a31f2c9784aa5e648a1f94 /core | |
| parent | b3ebc306c256bb75282da23e5e3995fca6680ba0 (diff) | |
| parent | 6f0a36e691fd4c434a80631e4dda212d35745d83 (diff) | |
| download | frameworks_base-ce6d3ed6120e79d7a663dac3a5aa1ffe02a6a23e.zip frameworks_base-ce6d3ed6120e79d7a663dac3a5aa1ffe02a6a23e.tar.gz frameworks_base-ce6d3ed6120e79d7a663dac3a5aa1ffe02a6a23e.tar.bz2 | |
am 6f0a36e6: Merge "Enforce READ_EXTERNAL_STORAGE on emulator." into jb-mr2-dev
* commit '6f0a36e691fd4c434a80631e4dda212d35745d83':
Enforce READ_EXTERNAL_STORAGE on emulator.
Diffstat (limited to 'core')
| -rw-r--r-- | core/res/res/xml/storage_list.xml | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/core/res/res/xml/storage_list.xml b/core/res/res/xml/storage_list.xml index 944bb3a..ceebdcc 100644 --- a/core/res/res/xml/storage_list.xml +++ b/core/res/res/xml/storage_list.xml @@ -17,24 +17,12 @@ */ --> -<!-- The <device> element should contain one or more <storage> elements. - Exactly one of these should have the attribute primary="true". - This storage will be the primary external storage and should have mountPoint="/mnt/sdcard". - Each storage should have both a mountPoint and storageDescription attribute. - The following attributes are optional: - - primary: (boolean) this storage is the primary external storage - removable: (boolean) this is removable storage (for example, a real SD card) - emulated: (boolean) the storage is emulated via the FUSE sdcard daemon - mtpReserve: (integer) number of megabytes of storage MTP should reserve for free storage - (used for emulated storage that is shared with system's data partition) - - A storage should not have both emulated and removable set to true ---> +<!-- See storage config details at http://source.android.com/tech/storage/ --> <StorageList xmlns:android="http://schemas.android.com/apk/res/android"> <!-- removable is not set in nosdcard product --> - <storage android:mountPoint="/mnt/sdcard" - android:storageDescription="@string/storage_usb" - android:primary="true" /> + <storage + android:mountPoint="/storage/sdcard" + android:storageDescription="@string/storage_usb" + android:primary="true" /> </StorageList> |