Merge "Unhide requestStopRecording APIs" (80b01c7e) · Commits · e / os / android_frameworks_base

core/api/current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -26812,6 +26812,7 @@ package android.media.tv.interactive {
		method @CallSuper public void requestCurrentTvInputId();
		method @CallSuper public void requestSigning(@NonNull String, @NonNull String, @NonNull String, @NonNull byte[]);
		method @CallSuper public void requestStartRecording(@Nullable android.net.Uri);
		method @CallSuper public void requestStopRecording(@NonNull String);
		method @CallSuper public void requestStreamVolume();
		method @CallSuper public void requestTrackInfoList();
		method @CallSuper public void sendPlaybackCommandRequest(@NonNull String, @Nullable android.os.Bundle);
		@@ -26887,6 +26888,7 @@ package android.media.tv.interactive {
		method public void onRequestCurrentTvInputId(@NonNull String);
		method public void onRequestSigning(@NonNull String, @NonNull String, @NonNull String, @NonNull String, @NonNull byte[]);
		method public void onRequestStartRecording(@NonNull String, @Nullable android.net.Uri);
		method public void onRequestStopRecording(@NonNull String, @NonNull String);
		method public void onRequestStreamVolume(@NonNull String);
		method public void onRequestTrackInfoList(@NonNull String);
		method public void onSetVideoBounds(@NonNull String, @NonNull android.graphics.Rect);

+5 −6

Original line number	Diff line number	Diff line
		@@ -954,13 +954,14 @@ public abstract class TvInteractiveAppService extends Service {
		}

		/**
		* Requests starting of recording
		* Requests the recording associated with the recordingId to stop.
		*
		* <p> This is used to request the active {@link android.media.tv.TvRecordingClient} to
		* <p> This is used to request the associated {@link android.media.tv.TvRecordingClient} to
		* call {@link android.media.tv.TvRecordingClient#stopRecording()}.
		* @see android.media.tv.TvRecordingClient#stopRecording()
		*
		* @hide
		* @param recordingId The ID of the recording to stop. This is provided by the TV app in
		* {@link TvInteractiveAppView#notifyRecordingStarted(String)}
		* @see android.media.tv.TvRecordingClient#stopRecording()
		*/
		@CallSuper
		public void requestStopRecording(@NonNull String recordingId) {
		@@ -978,8 +979,6 @@ public abstract class TvInteractiveAppService extends Service {
		});
		}



		/**
		* Requests signing of the given data.
		*

+7 −4

Original line number	Diff line number	Diff line
		@@ -877,7 +877,8 @@ public class TvInteractiveAppView extends ViewGroup {
		* is called.
		*
		* @param iAppServiceId The ID of the TV interactive app service bound to this view.
		* @param programUri The program URI to record
		* @param programUri The URI of the program to record
		*
		*/
		public void onRequestStartRecording(
		@NonNull String iAppServiceId,
		@@ -885,12 +886,14 @@ public class TvInteractiveAppView extends ViewGroup {
		}

		/**
		* This is called when {@link TvInteractiveAppService.Session#requestStopRecording()}
		* This is called when {@link TvInteractiveAppService.Session#requestStopRecording(String)}
		* is called.
		*
		* @param iAppServiceId The ID of the TV interactive app service bound to this view.
		* @param recordingId The ID of the recording to stop.
		* @hide
		* @param recordingId The ID of the recording to stop. This is provided by the TV app in
		* {@link #notifyRecordingStarted(String)}
		* @see #notifyRecordingStarted(String)
		* @see #notifyRecordingStopped(String)
		*/
		public void onRequestStopRecording(
		@NonNull String iAppServiceId,