Merge "Add Context constant for TV IApp Service" (9a23c4f0) · Commits · e / os / android_frameworks_base

core/api/current.txt

+8 −0

Original line number	Diff line number	Diff line
		@@ -10748,6 +10748,7 @@ package android.content {
		field public static final String TELEPHONY_SUBSCRIPTION_SERVICE = "telephony_subscription_service";
		field public static final String TEXT_CLASSIFICATION_SERVICE = "textclassification";
		field public static final String TEXT_SERVICES_MANAGER_SERVICE = "textservices";
		field public static final String TV_IAPP_SERVICE = "tv_iapp";
		field public static final String TV_INPUT_SERVICE = "tv_input";
		field public static final String UI_MODE_SERVICE = "uimode";
		field public static final String USAGE_STATS_SERVICE = "usagestats";
		@@ -26244,6 +26245,13 @@ package android.media.tv {

		}

		package android.media.tv.interactive {

		public final class TvIAppManager {
		}

		}

		package android.mtp {

		public final class MtpConstants {

+11 −0

Original line number	Diff line number	Diff line
		@@ -126,6 +126,8 @@ import android.media.projection.MediaProjectionManager;
		import android.media.soundtrigger.SoundTriggerManager;
		import android.media.tv.ITvInputManager;
		import android.media.tv.TvInputManager;
		import android.media.tv.interactive.ITvIAppManager;
		import android.media.tv.interactive.TvIAppManager;
		import android.media.tv.tunerresourcemanager.ITunerResourceManager;
		import android.media.tv.tunerresourcemanager.TunerResourceManager;
		import android.net.ConnectivityFrameworkInitializer;
		@@ -957,6 +959,15 @@ public final class SystemServiceRegistry {
		}
		});

		registerService(Context.TV_IAPP_SERVICE, TvIAppManager.class,
		new CachedServiceFetcher<TvIAppManager>() {
		@Override
		public TvIAppManager createService(ContextImpl ctx) throws ServiceNotFoundException {
		IBinder iBinder = ServiceManager.getServiceOrThrow(Context.TV_IAPP_SERVICE);
		ITvIAppManager service = ITvIAppManager.Stub.asInterface(iBinder);
		return new TvIAppManager(service, ctx.getUserId());
		}});

		registerService(Context.TV_INPUT_SERVICE, TvInputManager.class,
		new CachedServiceFetcher<TvInputManager>() {
		@Override

+11 −0

Original line number	Diff line number	Diff line
		@@ -3777,6 +3777,7 @@ public abstract class Context {
		PRINT_SERVICE,
		CONSUMER_IR_SERVICE,
		//@hide: TRUST_SERVICE,
		TV_IAPP_SERVICE,
		TV_INPUT_SERVICE,
		//@hide: TV_TUNER_RESOURCE_MGR_SERVICE,
		//@hide: NETWORK_SCORE_SERVICE,
		@@ -5289,6 +5290,16 @@ public abstract class Context {
		*/
		public static final String TRUST_SERVICE = "trust";

		/**
		* Use with {@link #getSystemService(String)} to retrieve a
		* {@link android.media.tv.interactive.TvIAppManager} for interacting with TV interactive
		* applications (TV iApp) on the device.
		*
		* @see #getSystemService(String)
		* @see android.media.tv.interactive.TvIAppManager
		*/
		public static final String TV_IAPP_SERVICE = "tv_iapp";

		/**
		* Use with {@link #getSystemService(String)} to retrieve a
		* {@link android.media.tv.TvInputManager} for interacting with TV inputs

+5 −2

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package android.media.tv.interactive;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.SystemService;
		import android.content.Context;
		import android.os.Handler;
		import android.os.IBinder;
		import android.os.RemoteException;
		@@ -30,10 +31,10 @@ import com.android.internal.util.Preconditions;
		/**
		* Central system API to the overall TV interactive application framework (TIAF) architecture, which
		* arbitrates interaction between applications and interactive apps.
		* @hide
		*/
		@SystemService("tv_interactive_app")
		@SystemService(Context.TV_IAPP_SERVICE)
		public final class TvIAppManager {
		// TODO: cleanup and unhide public APIs
		private static final String TAG = "TvIAppManager";

		private final ITvIAppManager mService;
		@@ -49,6 +50,7 @@ public final class TvIAppManager {

		private final ITvIAppClient mClient;

		/** @hide */
		public TvIAppManager(ITvIAppManager service, int userId) {
		mService = service;
		mUserId = userId;
		@@ -125,6 +127,7 @@ public final class TvIAppManager {

		/**
		* The Session provides the per-session functionality of interactive app.
		* @hide
		*/
		public static final class Session {
		private final ITvIAppManager mService;

+1 −2

Original line number	Diff line number	Diff line
		@@ -86,8 +86,7 @@ public class TvIAppManagerService extends SystemService {
		if (DEBUG) {
		Slogf.d(TAG, "onStart");
		}
		// TODO: make service name a constant in Context
		publishBinderService("tv_interactive_app", new BinderService());
		publishBinderService(Context.TV_IAPP_SERVICE, new BinderService());
		}

		private SessionState getSessionState(IBinder sessionToken) {