Merge "TIAF API review: xml attributes and package handling" into tm-dev (566a9a0f) · Commits · e / os / android_frameworks_base

media/java/android/media/tv/interactive/TvInteractiveAppManager.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -1813,8 +1813,8 @@ public final class TvInteractiveAppManager {
		}

		/**
		* This is called when {@link TvIAppService.Session#notifyTeletextAppStateChanged} is
		* called.
		* This is called when {@link TvInteractiveAppService.Session#notifyTeletextAppStateChanged}
		* is called.
		*
		* @param session A {@link TvInteractiveAppManager.Session} associated with this callback.
		* @param state the current state.

+5 −5

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package android.media.tv.interactive;
		import android.annotation.MainThread;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.SdkConstant;
		import android.annotation.StringDef;
		import android.annotation.SuppressLint;
		import android.app.ActivityManager;
		@@ -76,15 +77,14 @@ public abstract class TvInteractiveAppService extends Service {

		private static final int DETACH_MEDIA_VIEW_TIMEOUT_MS = 5000;

		// TODO: cleanup and unhide APIs.

		/**
		* This is the interface name that a service implementing a TV Interactive App service should
		* say that it supports -- that is, this is the action it uses for its intent filter. To be
		* supported, the service must also require the
		* android.Manifest.permission#BIND_TV_INTERACTIVE_APP permission so that other applications
		* cannot abuse it.
		* {@link android.Manifest.permission#BIND_TV_INTERACTIVE_APP} permission so that other
		* applications cannot abuse it.
		*/
		@SdkConstant(SdkConstant.SdkConstantType.SERVICE_ACTION)
		public static final String SERVICE_INTERFACE =
		"android.media.tv.interactive.TvInteractiveAppService";

		@@ -383,7 +383,7 @@ public abstract class TvInteractiveAppService extends Service {
		}

		/**
		* Resets TvIAppService session.
		* Resets TvInteractiveAppService session.
		*/
		public void onResetInteractiveApp() {
		}