From a6fc16acb1dd4dc4e663b33bcd43ede40a790b5b Mon Sep 17 00:00:00 2001 From: David Zhao Date: Thu, 20 Oct 2022 14:30:43 -0700 Subject: Add handling for selectTrack command Bug: 241110408 Test: Cuttlefish manually Change-Id: I9192ae99e6381998f4deba6500ee5832ba7b52ca --- src/com/android/tv/interactive/IAppManager.java | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) (limited to 'src/com/android/tv/interactive/IAppManager.java') diff --git a/src/com/android/tv/interactive/IAppManager.java b/src/com/android/tv/interactive/IAppManager.java index 7c8e04c8..29de5930 100644 --- a/src/com/android/tv/interactive/IAppManager.java +++ b/src/com/android/tv/interactive/IAppManager.java @@ -16,6 +16,9 @@ package com.android.tv.interactive; +import static com.android.tv.util.CaptionSettings.OPTION_OFF; +import static com.android.tv.util.CaptionSettings.OPTION_ON; + import android.annotation.TargetApi; import android.graphics.Rect; import android.media.tv.TvTrackInfo; @@ -221,7 +224,25 @@ public class IAppManager { } break; case TvInteractiveAppService.PLAYBACK_COMMAND_TYPE_SELECT_TRACK: - // TODO: Handle select track command + if (mTvView != null && parameters != null) { + int trackType = parameters.getInt( + TvInteractiveAppService.COMMAND_PARAMETER_KEY_TRACK_TYPE, + -1); + String trackId = parameters.getString( + TvInteractiveAppService.COMMAND_PARAMETER_KEY_TRACK_ID, + null); + switch (trackType) { + case TvTrackInfo.TYPE_AUDIO: + // When trackId is null, deselects current audio track. + mHandler.post(() -> mMainActivity.selectAudioTrack(trackId)); + break; + case TvTrackInfo.TYPE_SUBTITLE: + // When trackId is null, turns off captions. + mHandler.post(() -> mMainActivity.selectSubtitleTrack( + trackId == null ? OPTION_OFF : OPTION_ON, trackId)); + break; + } + } break; case TvInteractiveAppService.PLAYBACK_COMMAND_TYPE_SET_STREAM_VOLUME: if (parameters == null) { -- cgit v1.2.3