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

Commit 43f7b8a2 authored by Wei Jia's avatar Wei Jia
Browse files

MediaPlayer2: make TrackInfo.getLanguage return NonNull 

Test: cts
Bug: 126702181
Change-Id: I27f03343ee905e46ab48e5667b0ed928cadf772c
parent 6693dc93

api/current.txt

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
















  public static class MediaPlayer2.TrackInfo {







  public static class MediaPlayer2.TrackInfo {











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







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











    method @Nullable public String getLanguage();







    method @NonNull public String getLanguage();











    method public int getTrackType();







    method public int getTrackType();











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







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











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







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

























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



+1
−1




























Original line number
Original line
Diff line number
Diff line








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









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







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











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







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











         */







         */











        public @Nullable String getLanguage() {







        public @NonNull String getLanguage() {











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







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











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







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











        }







        }