Merge "Extend MediaScanner and MtpDatabase to support RAW image files" (90131a91) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -22500,6 +22500,7 @@ package android.mtp {
		field public static final int FORMAT_AUDIBLE = 47364; // 0xb904
		field public static final int FORMAT_AVI = 12298; // 0x300a
		field public static final int FORMAT_BMP = 14340; // 0x3804
		field public static final int FORMAT_DNG = 14353; // 0x3811
		field public static final int FORMAT_DPOF = 12294; // 0x3006
		field public static final int FORMAT_EXECUTABLE = 12291; // 0x3003
		field public static final int FORMAT_EXIF_JPEG = 14337; // 0x3801

api/system-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -24056,6 +24056,7 @@ package android.mtp {
		field public static final int FORMAT_AUDIBLE = 47364; // 0xb904
		field public static final int FORMAT_AVI = 12298; // 0x300a
		field public static final int FORMAT_BMP = 14340; // 0x3804
		field public static final int FORMAT_DNG = 14353; // 0x3811
		field public static final int FORMAT_DPOF = 12294; // 0x3006
		field public static final int FORMAT_EXECUTABLE = 12291; // 0x3003
		field public static final int FORMAT_EXIF_JPEG = 14337; // 0x3801

api/test-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -22508,6 +22508,7 @@ package android.mtp {
		field public static final int FORMAT_AUDIBLE = 47364; // 0xb904
		field public static final int FORMAT_AVI = 12298; // 0x300a
		field public static final int FORMAT_BMP = 14340; // 0x3804
		field public static final int FORMAT_DNG = 14353; // 0x3811
		field public static final int FORMAT_DPOF = 12294; // 0x3006
		field public static final int FORMAT_EXECUTABLE = 12291; // 0x3003
		field public static final int FORMAT_EXIF_JPEG = 14337; // 0x3801

media/java/android/media/MediaFile.java

+38 −10

Original line number	Diff line number	Diff line
		@@ -82,6 +82,18 @@ public class MediaFile {
		private static final int FIRST_IMAGE_FILE_TYPE = FILE_TYPE_JPEG;
		private static final int LAST_IMAGE_FILE_TYPE = FILE_TYPE_WEBP;

		// Raw image file types
		public static final int FILE_TYPE_DNG = 300;
		public static final int FILE_TYPE_CR2 = 301;
		public static final int FILE_TYPE_NEF = 302;
		public static final int FILE_TYPE_NRW = 303;
		public static final int FILE_TYPE_ARW = 304;
		public static final int FILE_TYPE_RW2 = 305;
		public static final int FILE_TYPE_ORF = 306;
		public static final int FILE_TYPE_RAF = 307;
		private static final int FIRST_RAW_IMAGE_FILE_TYPE = FILE_TYPE_DNG;
		private static final int LAST_RAW_IMAGE_FILE_TYPE = FILE_TYPE_RAF;

		// Playlist file types
		public static final int FILE_TYPE_M3U = 41;
		public static final int FILE_TYPE_PLS = 42;
		@@ -219,6 +231,15 @@ public class MediaFile {
		addFileType("WBMP", FILE_TYPE_WBMP, "image/vnd.wap.wbmp");
		addFileType("WEBP", FILE_TYPE_WEBP, "image/webp");

		addFileType("DNG", FILE_TYPE_DNG, "image/x-adobe-dng", MtpConstants.FORMAT_DNG);
		addFileType("CR2", FILE_TYPE_CR2, "image/x-canon-cr2");
		addFileType("NEF", FILE_TYPE_NEF, "image/x-nikon-nef");
		addFileType("NRW", FILE_TYPE_NRW, "image/x-nikon-nrw");
		addFileType("ARW", FILE_TYPE_ARW, "image/x-sony-arw");
		addFileType("RW2", FILE_TYPE_RW2, "image/x-panasonic-rw2");
		addFileType("ORF", FILE_TYPE_ORF, "image/x-olympus-orf");
		addFileType("RAF", FILE_TYPE_RAF, "image/x-fuji-raf");

		addFileType("M3U", FILE_TYPE_M3U, "audio/x-mpegurl", MtpConstants.FORMAT_M3U_PLAYLIST);
		addFileType("M3U", FILE_TYPE_M3U, "application/x-mpegurl", MtpConstants.FORMAT_M3U_PLAYLIST);
		addFileType("PLS", FILE_TYPE_PLS, "audio/x-scpls", MtpConstants.FORMAT_PLS_PLAYLIST);
		@@ -258,7 +279,14 @@ public class MediaFile {

		public static boolean isImageFileType(int fileType) {
		return (fileType >= FIRST_IMAGE_FILE_TYPE &&
		fileType <= LAST_IMAGE_FILE_TYPE);
		fileType <= LAST_IMAGE_FILE_TYPE)
		\|\| (fileType >= FIRST_RAW_IMAGE_FILE_TYPE &&
		fileType <= LAST_RAW_IMAGE_FILE_TYPE);
		}

		public static boolean isRawImageFileType(int fileType) {
		return (fileType >= FIRST_RAW_IMAGE_FILE_TYPE &&
		fileType <= LAST_RAW_IMAGE_FILE_TYPE);
		}

		public static boolean isPlayListFileType(int fileType) {

media/java/android/media/MediaScanner.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -899,7 +899,8 @@ public class MediaScanner implements AutoCloseable {
		values.put(Audio.Media.IS_ALARM, alarms);
		values.put(Audio.Media.IS_MUSIC, music);
		values.put(Audio.Media.IS_PODCAST, podcasts);
		} else if (mFileType == MediaFile.FILE_TYPE_JPEG && !mNoMedia) {
		} else if ((mFileType == MediaFile.FILE_TYPE_JPEG
		\|\| MediaFile.isRawImageFileType(mFileType)) && !mNoMedia) {
		ExifInterface exif = null;
		try {
		exif = new ExifInterface(entry.mPath);