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

Commit 1d7a3f9b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "MediaPlayer2: make TrackInfo.getLanguage return NonNull"

parents 5e72196b 43f7b8a2

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -25725,7 +25725,7 @@ package android.media { 














  public static class MediaPlayer2.TrackInfo {















    method @Nullable public android.media.MediaFormat getFormat();













    method @Nullable public String getLanguage();













    method @NonNull public String getLanguage();















    method public int getTrackType();















    field public static final int MEDIA_TRACK_TYPE_AUDIO = 2; // 0x2















    field public static final int MEDIA_TRACK_TYPE_METADATA = 5; // 0x5

























media/apex/java/android/media/MediaPlayer2.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -1985,7 +1985,7 @@ public class MediaPlayer2 implements AutoCloseable













         * When the language is unknown or could not be determined,















         * ISO-639-2 language code, "und", is returned.















         */













        public @Nullable String getLanguage() {













        public @NonNull String getLanguage() {















            String language = mFormat.getString(MediaFormat.KEY_LANGUAGE);















            return language == null ? "und" : language;















        }