Merge "MTP: media info can not be retrieved via MTP#2" into rvc-dev am:... (f58cc557) · Commits · e / os / android_frameworks_base

media/java/android/mtp/MtpDatabase.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -165,6 +165,7 @@ public class MtpDatabase implements AutoCloseable {
		MtpConstants.PROPERTY_TRACK,
		MtpConstants.PROPERTY_ORIGINAL_RELEASE_DATE,
		MtpConstants.PROPERTY_DURATION,
		MtpConstants.PROPERTY_GENRE,
		MtpConstants.PROPERTY_COMPOSER,
		MtpConstants.PROPERTY_AUDIO_WAVE_CODEC,
		MtpConstants.PROPERTY_BITRATE_TYPE,

+6 −0

Original line number	Diff line number	Diff line
		@@ -122,15 +122,21 @@ class MtpPropertyGroup {
		type = MtpConstants.TYPE_STR;
		break;
		case MtpConstants.PROPERTY_ARTIST:
		column = Audio.AudioColumns.ARTIST;
		type = MtpConstants.TYPE_STR;
		break;
		case MtpConstants.PROPERTY_ALBUM_NAME:
		column = Audio.AudioColumns.ALBUM;
		type = MtpConstants.TYPE_STR;
		break;
		case MtpConstants.PROPERTY_ALBUM_ARTIST:
		column = Audio.AudioColumns.ALBUM_ARTIST;
		type = MtpConstants.TYPE_STR;
		break;
		case MtpConstants.PROPERTY_GENRE:
		column = Audio.AudioColumns.GENRE;
		type = MtpConstants.TYPE_STR;
		break;
		case MtpConstants.PROPERTY_COMPOSER:
		column = Audio.AudioColumns.COMPOSER;
		type = MtpConstants.TYPE_STR;