Merge "Add MTP_OBJECT_ID column name to MediaStore.MediaColumns" (f17896df) · Commits · e / os / android_frameworks_base

core/java/android/provider/MediaStore.java

+11 −4

Original line number	Diff line number	Diff line
		@@ -238,17 +238,24 @@ 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

+1 −1

Original line number	Diff line number	Diff line
		@@ -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)) {