diff options
| author | Mike Lockwood <lockwood@android.com> | 2010-07-19 11:31:38 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-07-19 11:31:38 -0700 |
| commit | f17896df20276ac06e1932b512d3957a829cff4d (patch) | |
| tree | 70f294581f2608af41f830a60a66a4222a7f84c6 | |
| parent | 61636c24f3ec72e6b8ecba06f6f0023281c38f80 (diff) | |
| parent | cbaea35759791f083735f7a5c43e0dc0ed228ff1 (diff) | |
| download | frameworks_base-f17896df20276ac06e1932b512d3957a829cff4d.zip frameworks_base-f17896df20276ac06e1932b512d3957a829cff4d.tar.gz frameworks_base-f17896df20276ac06e1932b512d3957a829cff4d.tar.bz2 | |
Merge "Add MTP_OBJECT_ID column name to MediaStore.MediaColumns"
| -rw-r--r-- | core/java/android/provider/MediaStore.java | 15 | ||||
| -rw-r--r-- | media/java/android/media/MediaScanner.java | 2 |
2 files changed, 12 insertions, 5 deletions
diff --git a/core/java/android/provider/MediaStore.java b/core/java/android/provider/MediaStore.java index 293d31c..41dfc00 100644 --- a/core/java/android/provider/MediaStore.java +++ b/core/java/android/provider/MediaStore.java @@ -239,16 +239,23 @@ public final class MediaStore { public static final String MIME_TYPE = "mime_type"; /** + * The row ID in the MTP object table corresponding to this media file. + * <P>Type: INTEGER</P> + * @hide + */ + public static final String MTP_OBJECT_ID = "object_id"; + + /** * The MTP object handle of a newly transfered file. - * Used internally by the MediaScanner + * Used to pass the new file's object handle through the media scanner + * from MTP to the media provider + * For internal use only by MTP, media scanner and media provider. * <P>Type: INTEGER</P> * @hide */ - public static final String MTP_OBJECT_HANDLE = "mtp_object_handle"; + public static final String MEDIA_SCANNER_NEW_OBJECT_ID = "media_scanner_new_object_id"; } - - /** * Media provider interface used by MTP implementation. * @hide diff --git a/media/java/android/media/MediaScanner.java b/media/java/android/media/MediaScanner.java index 7cbe409..7f91c22 100644 --- a/media/java/android/media/MediaScanner.java +++ b/media/java/android/media/MediaScanner.java @@ -627,7 +627,7 @@ public class MediaScanner map.put(MediaStore.MediaColumns.SIZE, mFileSize); map.put(MediaStore.MediaColumns.MIME_TYPE, mMimeType); if (mMtpObjectHandle != 0) { - map.put(MediaStore.MediaColumns.MTP_OBJECT_HANDLE, mMtpObjectHandle); + map.put(MediaStore.MediaColumns.MEDIA_SCANNER_NEW_OBJECT_ID, mMtpObjectHandle); } if (MediaFile.isVideoFileType(mFileType)) { |