diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-04-05 10:21:27 -0400 |
|---|---|---|
| committer | Mike Lockwood <lockwood@android.com> | 2011-05-04 10:41:20 -0400 |
| commit | d3e4290c0442b6dcf24bcf642f4fc26d12d8e7aa (patch) | |
| tree | 4604a25cd5f0617b9667f7b2d03ab56d57e13207 /core/java/android | |
| parent | 10fbba21e4827a1582d97aa99e4e8d772ce04920 (diff) | |
| download | frameworks_base-d3e4290c0442b6dcf24bcf642f4fc26d12d8e7aa.zip frameworks_base-d3e4290c0442b6dcf24bcf642f4fc26d12d8e7aa.tar.gz frameworks_base-d3e4290c0442b6dcf24bcf642f4fc26d12d8e7aa.tar.bz2 | |
DO NOT MERGE MTP and media provider support for multiple storage devices:
- MTP support for multiple storage units
- Add storage_id column to media database for MTP storage ID
- Add framework resource for defining mount points and user visible descriptions
for multiple volumes
- Clean up locking in MtpServer JNI code
Change-Id: I53d501fd4891ebe27408135fb598027e06b7e495
Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/provider/MediaStore.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/core/java/android/provider/MediaStore.java b/core/java/android/provider/MediaStore.java index b59421e..c9b2f97 100644 --- a/core/java/android/provider/MediaStore.java +++ b/core/java/android/provider/MediaStore.java @@ -344,6 +344,13 @@ public final class MediaStore { */ public interface FileColumns extends MediaColumns { /** + * The MTP storage ID of the file + * <P>Type: INTEGER</P> + * @hide + */ + public static final String STORAGE_ID = "storage_id"; + + /** * The MTP format code of the file * <P>Type: INTEGER</P> * @hide |