Merge changes I9c8bc497,I3be9a107 into main (64c3f4fc) · Commits · e / os / android_frameworks_base

media/java/android/media/tv/SignalingDataResponse.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -73,6 +73,10 @@ public final class SignalingDataResponse extends BroadcastInfoResponse implement
		/**
		* Gets a list of types of metadata that are contained in this response.
		*
		* <p> This list correlates to all the available types that can be found within
		* {@link #getSignalingDataInfoList()}. This list is determined by the types specified in
		* {@link SignalingDataRequest#getSignalingDataTypes()}.
		*
		* <p> A list of types available are defined in {@link SignalingDataRequest}.
		* For more information about these types, see A/344:2023-5 9.2.10 - Query Signaling Data API.
		*

+7 −1

Original line number	Diff line number	Diff line
		@@ -964,7 +964,11 @@ public abstract class TvInteractiveAppService extends Service {

		/**
		* Called when the TV App sends the selected track info as a response to
		* {@link #requestSelectedTrackInfo()}
		* {@link #requestSelectedTrackInfo()}.
		*
		* <p> When a selected track changes as a result of a new selection,
		* {@link #onTrackSelected(int, String)} should be used instead to communicate the specific
		* track selection.
		*
		* @param tracks A list of {@link TvTrackInfo} that are currently selected
		*/
		@@ -1383,6 +1387,8 @@ public abstract class TvInteractiveAppService extends Service {
		* <p> Normally, track info cannot be synchronized until the channel has
		* been changed. This is used when the session of the {@link TvInteractiveAppService}
		* is newly created and the normal synchronization has not happened yet.
		*
		* <p> The track info will be returned in {@link #onSelectedTrackInfo(List)}
		*/
		@FlaggedApi(Flags.FLAG_TIAF_V_APIS)
		@CallSuper

+2 −1

Original line number	Diff line number	Diff line
		@@ -585,7 +585,8 @@ public class TvInteractiveAppView extends ViewGroup {
		}

		/**
		* Sends the currently selected track info to the TV Interactive App.
		* Sends the currently selected track info to the TV Interactive App in response to a
		* {@link TvInteractiveAppCallback#onRequestSelectedTrackInfo(String)} request.
		*
		* @param tracks list of {@link TvTrackInfo} of the currently selected track(s)
		*/