Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6fb5f2c0 authored by James Wei's avatar James Wei Committed by Android (Google) Code Review
Browse files

Merge "MTP: media info can not be retrieved via MTP#2" into rvc-dev

parents 1cf3ce8f f545a3ac

media/java/android/mtp/MtpDatabase.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -165,6 +165,7 @@ public class MtpDatabase implements AutoCloseable { 
            MtpConstants.PROPERTY_TRACK,

            MtpConstants.PROPERTY_TRACK,

            MtpConstants.PROPERTY_ORIGINAL_RELEASE_DATE,

            MtpConstants.PROPERTY_ORIGINAL_RELEASE_DATE,

            MtpConstants.PROPERTY_DURATION,

            MtpConstants.PROPERTY_DURATION,

            MtpConstants.PROPERTY_GENRE,

            MtpConstants.PROPERTY_COMPOSER,

            MtpConstants.PROPERTY_COMPOSER,

            MtpConstants.PROPERTY_AUDIO_WAVE_CODEC,

            MtpConstants.PROPERTY_AUDIO_WAVE_CODEC,

            MtpConstants.PROPERTY_BITRATE_TYPE,

            MtpConstants.PROPERTY_BITRATE_TYPE,

media/java/android/mtp/MtpPropertyGroup.java

+6 −0
Original line number Original line Diff line number Diff line
@@ -122,15 +122,21 @@ class MtpPropertyGroup { 
                type = MtpConstants.TYPE_STR;

                type = MtpConstants.TYPE_STR;

                break;

                break;

            case MtpConstants.PROPERTY_ARTIST:

            case MtpConstants.PROPERTY_ARTIST:

                column = Audio.AudioColumns.ARTIST;

                type = MtpConstants.TYPE_STR;

                type = MtpConstants.TYPE_STR;

                break;

                break;

            case MtpConstants.PROPERTY_ALBUM_NAME:

            case MtpConstants.PROPERTY_ALBUM_NAME:

                column = Audio.AudioColumns.ALBUM;

                type = MtpConstants.TYPE_STR;

                type = MtpConstants.TYPE_STR;

                break;

                break;

            case MtpConstants.PROPERTY_ALBUM_ARTIST:

            case MtpConstants.PROPERTY_ALBUM_ARTIST:

                column = Audio.AudioColumns.ALBUM_ARTIST;

                column = Audio.AudioColumns.ALBUM_ARTIST;

                type = MtpConstants.TYPE_STR;

                type = MtpConstants.TYPE_STR;

                break;

                break;

            case MtpConstants.PROPERTY_GENRE:

                column = Audio.AudioColumns.GENRE;

                type = MtpConstants.TYPE_STR;

                break;

            case MtpConstants.PROPERTY_COMPOSER:

            case MtpConstants.PROPERTY_COMPOSER:

                column = Audio.AudioColumns.COMPOSER;

                column = Audio.AudioColumns.COMPOSER;

                type = MtpConstants.TYPE_STR;

                type = MtpConstants.TYPE_STR;