Merge "TIAF API review: remove prepare()" into tm-dev (365b716c) · Commits · e / os / android_frameworks_base

core/api/current.txt

+0 −2

Original line number	Diff line number	Diff line
		@@ -26139,7 +26139,6 @@ package android.media.tv.interactive {

		public final class TvInteractiveAppManager {
		method @NonNull public java.util.List<android.media.tv.interactive.TvInteractiveAppServiceInfo> getTvInteractiveAppServiceList();
		method public void prepare(@NonNull String, int);
		method public void registerAppLinkInfo(@NonNull String, @NonNull android.media.tv.interactive.AppLinkInfo);
		method public void registerCallback(@NonNull java.util.concurrent.Executor, @NonNull android.media.tv.interactive.TvInteractiveAppManager.TvInteractiveAppCallback);
		method public void sendAppLinkCommand(@NonNull String, @NonNull android.os.Bundle);
		@@ -26191,7 +26190,6 @@ package android.media.tv.interactive {
		method public void onAppLinkCommand(@NonNull android.os.Bundle);
		method @Nullable public final android.os.IBinder onBind(@NonNull android.content.Intent);
		method @Nullable public abstract android.media.tv.interactive.TvInteractiveAppService.Session onCreateSession(@NonNull String, int);
		method public abstract void onPrepare(int);
		method public void onRegisterAppLinkInfo(@NonNull android.media.tv.interactive.AppLinkInfo);
		method public void onUnregisterAppLinkInfo(@NonNull android.media.tv.interactive.AppLinkInfo);
		field public static final String COMMAND_PARAMETER_KEY_CHANGE_CHANNEL_QUIETLY = "command_change_channel_quietly";

+0 −1

Original line number	Diff line number	Diff line
		@@ -34,7 +34,6 @@ import android.view.Surface;
		*/
		interface ITvInteractiveAppManager {
		List<TvInteractiveAppServiceInfo> getTvInteractiveAppServiceList(int userId);
		void prepare(String tiasId, int type, int userId);
		void registerAppLinkInfo(String tiasId, in AppLinkInfo info, int userId);
		void unregisterAppLinkInfo(String tiasId, in AppLinkInfo info, int userId);
		void sendAppLinkCommand(String tiasId, in Bundle command, int userId);

+0 −1

Original line number	Diff line number	Diff line
		@@ -32,7 +32,6 @@ oneway interface ITvInteractiveAppService {
		void unregisterCallback(in ITvInteractiveAppServiceCallback callback);
		void createSession(in InputChannel channel, in ITvInteractiveAppSessionCallback callback,
		in String iAppServiceId, int type);
		void prepare(int type);
		void registerAppLinkInfo(in AppLinkInfo info);
		void unregisterAppLinkInfo(in AppLinkInfo info);
		void sendAppLinkCommand(in Bundle command);

+0 −20

Original line number	Diff line number	Diff line
		@@ -30,7 +30,6 @@ import android.media.tv.BroadcastInfoResponse;
		import android.media.tv.TvContentRating;
		import android.media.tv.TvInputManager;
		import android.media.tv.TvTrackInfo;
		import android.media.tv.interactive.TvInteractiveAppServiceInfo.InteractiveAppType;
		import android.net.Uri;
		import android.os.Bundle;
		import android.os.Handler;
		@@ -774,25 +773,6 @@ public final class TvInteractiveAppManager {
		}
		}

		/**
		* Prepares TV Interactive App service environment for the given type.
		*
		* <p>This method brings up the corresponding {@link TvInteractiveAppService} and prepare needed
		* resources. It's used to set up the resources in advance, or handle non-session operations.
		*
		* @param tvIAppServiceId The ID of TV interactive service to prepare the resources. The
		* ID can be found in {@link TvInteractiveAppServiceInfo#getId()}.
		*
		* @see TvInteractiveAppService.Session
		*/
		public void prepare(@NonNull String tvIAppServiceId, @InteractiveAppType int type) {
		try {
		mService.prepare(tvIAppServiceId, type, mUserId);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}

		/**
		* Registers an Android application link info record which can be used to launch the specific
		* Android application by TV interactive App RTE.

+0 −10

Original line number	Diff line number	Diff line
		@@ -217,11 +217,6 @@ public abstract class TvInteractiveAppService extends Service {
		.sendToTarget();
		}

		@Override
		public void prepare(int type) {
		onPrepare(type);
		}

		@Override
		public void registerAppLinkInfo(AppLinkInfo appLinkInfo) {
		onRegisterAppLinkInfo(appLinkInfo);
		@@ -240,11 +235,6 @@ public abstract class TvInteractiveAppService extends Service {
		return tvIAppServiceBinder;
		}

		/**
		* Prepares TV Interactive App service for the given type.
		*/
		public abstract void onPrepare(@TvInteractiveAppServiceInfo.InteractiveAppType int type);

		/**
		* Called when a request to register an Android application link info record is received.
		*/