diff --git a/api/current.txt b/api/current.txt index 7f4b8f0c9472e..ccdac7e04d77e 100644 --- a/api/current.txt +++ b/api/current.txt @@ -17527,6 +17527,7 @@ package android.media.tv { field public static final int TIME_SHIFT_STATUS_UNAVAILABLE = 2; // 0x2 field public static final int TIME_SHIFT_STATUS_UNKNOWN = 0; // 0x0 field public static final int TIME_SHIFT_STATUS_UNSUPPORTED = 1; // 0x1 + field public static final int VIDEO_UNAVAILABLE_REASON_AUDIO_ONLY = 4; // 0x4 field public static final int VIDEO_UNAVAILABLE_REASON_BUFFERING = 3; // 0x3 field public static final int VIDEO_UNAVAILABLE_REASON_TUNING = 1; // 0x1 field public static final int VIDEO_UNAVAILABLE_REASON_UNKNOWN = 0; // 0x0 diff --git a/api/system-current.txt b/api/system-current.txt index 12ebc177d82d4..7dad2bf12cbd2 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -18890,6 +18890,7 @@ package android.media.tv { field public static final int TIME_SHIFT_STATUS_UNAVAILABLE = 2; // 0x2 field public static final int TIME_SHIFT_STATUS_UNKNOWN = 0; // 0x0 field public static final int TIME_SHIFT_STATUS_UNSUPPORTED = 1; // 0x1 + field public static final int VIDEO_UNAVAILABLE_REASON_AUDIO_ONLY = 4; // 0x4 field public static final int VIDEO_UNAVAILABLE_REASON_BUFFERING = 3; // 0x3 field public static final int VIDEO_UNAVAILABLE_REASON_TUNING = 1; // 0x1 field public static final int VIDEO_UNAVAILABLE_REASON_UNKNOWN = 0; // 0x0 diff --git a/media/java/android/media/tv/TvInputManager.java b/media/java/android/media/tv/TvInputManager.java index 3c67ea06deadf..ee2a2330b97e0 100644 --- a/media/java/android/media/tv/TvInputManager.java +++ b/media/java/android/media/tv/TvInputManager.java @@ -52,7 +52,7 @@ public final class TvInputManager { private static final String TAG = "TvInputManager"; static final int VIDEO_UNAVAILABLE_REASON_START = 0; - static final int VIDEO_UNAVAILABLE_REASON_END = 3; + static final int VIDEO_UNAVAILABLE_REASON_END = 4; /** * A generic reason. Video is not available due to an unspecified error. @@ -70,7 +70,11 @@ public final class TvInputManager { * Video is not available because the TV input stopped the playback temporarily to buffer more * data. */ - public static final int VIDEO_UNAVAILABLE_REASON_BUFFERING = VIDEO_UNAVAILABLE_REASON_END; + public static final int VIDEO_UNAVAILABLE_REASON_BUFFERING = 3; + /** + * Video is not available because the current program is audio-only. + */ + public static final int VIDEO_UNAVAILABLE_REASON_AUDIO_ONLY = VIDEO_UNAVAILABLE_REASON_END; private static final int TIME_SHIFT_STATUS_START = 0; private static final int TIME_SHIFT_STATUS_END = 3; @@ -306,6 +310,7 @@ public final class TvInputManager { *
  • {@link TvInputManager#VIDEO_UNAVAILABLE_REASON_TUNING} *
  • {@link TvInputManager#VIDEO_UNAVAILABLE_REASON_WEAK_SIGNAL} *
  • {@link TvInputManager#VIDEO_UNAVAILABLE_REASON_BUFFERING} + *
  • {@link TvInputManager#VIDEO_UNAVAILABLE_REASON_AUDIO_ONLY} * */ public void onVideoUnavailable(Session session, int reason) { diff --git a/media/java/android/media/tv/TvInputService.java b/media/java/android/media/tv/TvInputService.java index 4e7aaa056b99a..343ffcb8bf114 100644 --- a/media/java/android/media/tv/TvInputService.java +++ b/media/java/android/media/tv/TvInputService.java @@ -450,6 +450,7 @@ public abstract class TvInputService extends Service { *
  • {@link TvInputManager#VIDEO_UNAVAILABLE_REASON_TUNING} *
  • {@link TvInputManager#VIDEO_UNAVAILABLE_REASON_WEAK_SIGNAL} *
  • {@link TvInputManager#VIDEO_UNAVAILABLE_REASON_BUFFERING} + *
  • {@link TvInputManager#VIDEO_UNAVAILABLE_REASON_AUDIO_ONLY} * * @see #notifyVideoAvailable */ @@ -1525,6 +1526,7 @@ public abstract class TvInputService extends Service { *
  • {@link TvInputManager#VIDEO_UNAVAILABLE_REASON_TUNING} *
  • {@link TvInputManager#VIDEO_UNAVAILABLE_REASON_WEAK_SIGNAL} *
  • {@link TvInputManager#VIDEO_UNAVAILABLE_REASON_BUFFERING} + *
  • {@link TvInputManager#VIDEO_UNAVAILABLE_REASON_AUDIO_ONLY} * */ public void onHardwareVideoUnavailable(int reason) { } diff --git a/media/java/android/media/tv/TvView.java b/media/java/android/media/tv/TvView.java index 42c2cd76062e2..024ffd19b0da4 100644 --- a/media/java/android/media/tv/TvView.java +++ b/media/java/android/media/tv/TvView.java @@ -908,6 +908,7 @@ public class TvView extends ViewGroup { *
  • {@link TvInputManager#VIDEO_UNAVAILABLE_REASON_TUNING} *
  • {@link TvInputManager#VIDEO_UNAVAILABLE_REASON_WEAK_SIGNAL} *
  • {@link TvInputManager#VIDEO_UNAVAILABLE_REASON_BUFFERING} + *
  • {@link TvInputManager#VIDEO_UNAVAILABLE_REASON_AUDIO_ONLY} * */ public void onVideoUnavailable(String inputId, int reason) {