From 43f7b8a280ca7238aec35ae32f5d4a7409d2d0de Mon Sep 17 00:00:00 2001 From: Wei Jia Date: Thu, 7 Mar 2019 16:32:46 -0800 Subject: [PATCH] MediaPlayer2: make TrackInfo.getLanguage return NonNull Test: cts Bug: 126702181 Change-Id: I27f03343ee905e46ab48e5667b0ed928cadf772c --- api/current.txt | 2 +- media/apex/java/android/media/MediaPlayer2.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/current.txt b/api/current.txt index 58e2a7948e34f..5a85b93607474 100644 --- a/api/current.txt +++ b/api/current.txt @@ -25735,7 +25735,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 diff --git a/media/apex/java/android/media/MediaPlayer2.java b/media/apex/java/android/media/MediaPlayer2.java index f6b2031bc4568..5cd36216929e9 100644 --- a/media/apex/java/android/media/MediaPlayer2.java +++ b/media/apex/java/android/media/MediaPlayer2.java @@ -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; }