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

Commit 689cd2f5 authored by James Wei's avatar James Wei Committed by Automerger Merge Worker
Browse files

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

Change-Id: I991686fb3c1d3d86aadc46580e5a86eb980025c3
parents f58bd41b 6fb5f2c0

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,

media/java/android/mtp/MtpPropertyGroup.java

+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;