Merge "TIAF: rename IApp -> InteractiveApp." (bcf19024) · Commits · e / os / android_frameworks_base

core/api/current.txt

+32 −5

Original line number	Diff line number	Diff line
		@@ -11066,8 +11066,8 @@ 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 TV_INTERACTIVE_APP_SERVICE = "tv_interactive_app";
		field public static final String UI_MODE_SERVICE = "uimode";
		field public static final String USAGE_STATS_SERVICE = "usagestats";
		field public static final String USB_SERVICE = "usb";
		@@ -26868,16 +26868,43 @@ package android.media.tv {

		package android.media.tv.interactive {

		public final class TvIAppManager {
		public final class TvInteractiveAppInfo implements android.os.Parcelable {
		ctor public TvInteractiveAppInfo(@NonNull android.content.Context, @NonNull android.content.ComponentName);
		method public int describeContents();
		method @NonNull public String getId();
		method @Nullable public android.content.pm.ServiceInfo getServiceInfo();
		method @NonNull public int getSupportedTypes();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.media.tv.interactive.TvInteractiveAppInfo> CREATOR;
		field public static final int INTERACTIVE_APP_TYPE_ATSC = 2; // 0x2
		field public static final int INTERACTIVE_APP_TYPE_GINGA = 4; // 0x4
		field public static final int INTERACTIVE_APP_TYPE_HBBTV = 1; // 0x1
		}

		public final class TvInteractiveAppManager {
		method @NonNull public java.util.List<android.media.tv.interactive.TvInteractiveAppInfo> getTvInteractiveAppServiceList();
		}

		public abstract class TvIAppService extends android.app.Service {
		ctor public TvIAppService();
		public abstract class TvInteractiveAppService extends android.app.Service {
		ctor public TvInteractiveAppService();
		method public final android.os.IBinder onBind(android.content.Intent);
		field public static final String SERVICE_INTERFACE = "android.media.tv.interactive.TvIAppService";
		field public static final String SERVICE_INTERFACE = "android.media.tv.interactive.TvInteractiveAppService";
		field public static final String SERVICE_META_DATA = "android.media.tv.interactive.app";
		}

		public class TvInteractiveAppView extends android.view.ViewGroup {
		ctor public TvInteractiveAppView(@NonNull android.content.Context);
		ctor public TvInteractiveAppView(@NonNull android.content.Context, @Nullable android.util.AttributeSet);
		ctor public TvInteractiveAppView(@NonNull android.content.Context, @Nullable android.util.AttributeSet, int);
		method public void clearCallback();
		method public void setCallback(@NonNull java.util.concurrent.Executor, @NonNull android.media.tv.interactive.TvInteractiveAppView.TvInteractiveAppCallback);
		method public void startInteractiveApp();
		}

		public abstract static class TvInteractiveAppView.TvInteractiveAppCallback {
		ctor public TvInteractiveAppView.TvInteractiveAppCallback();
		}

		}

		package android.mtp {

core/java/android/app/SystemServiceRegistry.java

+11 −8

Original line number	Diff line number	Diff line
		@@ -124,8 +124,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.interactive.ITvInteractiveAppManager;
		import android.media.tv.interactive.TvInteractiveAppManager;
		import android.media.tv.tunerresourcemanager.ITunerResourceManager;
		import android.media.tv.tunerresourcemanager.TunerResourceManager;
		import android.nearby.NearbyFrameworkInitializer;
		@@ -964,13 +964,16 @@ public final class SystemServiceRegistry {
		}
		});

		registerService(Context.TV_IAPP_SERVICE, TvIAppManager.class,
		new CachedServiceFetcher<TvIAppManager>() {
		registerService(Context.TV_INTERACTIVE_APP_SERVICE, TvInteractiveAppManager.class,
		new CachedServiceFetcher<TvInteractiveAppManager>() {
		@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());
		public TvInteractiveAppManager createService(ContextImpl ctx)
		throws ServiceNotFoundException {
		IBinder iBinder =
		ServiceManager.getServiceOrThrow(Context.TV_INTERACTIVE_APP_SERVICE);
		ITvInteractiveAppManager service =
		ITvInteractiveAppManager.Stub.asInterface(iBinder);
		return new TvInteractiveAppManager(service, ctx.getUserId());
		}});

		registerService(Context.TV_INPUT_SERVICE, TvInputManager.class,

core/java/android/content/Context.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -3829,7 +3829,7 @@ public abstract class Context {
		PRINT_SERVICE,
		CONSUMER_IR_SERVICE,
		//@hide: TRUST_SERVICE,
		TV_IAPP_SERVICE,
		TV_INTERACTIVE_APP_SERVICE,
		TV_INPUT_SERVICE,
		//@hide: TV_TUNER_RESOURCE_MGR_SERVICE,
		//@hide: NETWORK_SCORE_SERVICE,
		@@ -5356,13 +5356,13 @@ public abstract class Context {

		/**
		* 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.
		* {@link android.media.tv.interactive.TvInteractiveAppManager} for interacting with TV
		* interactive applications on the device.
		*
		* @see #getSystemService(String)
		* @see android.media.tv.interactive.TvIAppManager
		* @see android.media.tv.interactive.TvInteractiveAppManager
		*/
		public static final String TV_IAPP_SERVICE = "tv_iapp";
		public static final String TV_INTERACTIVE_APP_SERVICE = "tv_interactive_app";

		/**
		* Use with {@link #getSystemService(String)} to retrieve a

core/res/res/values/attrs.xml

+6 −5

Original line number	Diff line number	Diff line
		@@ -9376,11 +9376,12 @@
		<attr name="canPauseRecording" format="boolean" />
		</declare-styleable>

		<!-- Use <code>tv-iapp</code> as the root tag of the XML resource that describes a
		{@link android.media.tv.interactive.TvIAppService}, which is referenced from its
		{@link android.media.tv.interactive.TvIAppService#SERVICE_META_DATA} meta-data entry.
		Described here are the attributes that can be included in that tag. -->
		<declare-styleable name="TvIAppService">
		<!-- Use <code>tv-interactive-app</code> as the root tag of the XML resource that describes a
		{@link android.media.tv.interactive.TvInteractiveAppService}, which is referenced
		from its
		{@link android.media.tv.interactive.TvInteractiveAppService#SERVICE_META_DATA}
		meta-data entry. Described here are the attributes that can be included in that tag. -->
		<declare-styleable name="TvInteractiveAppService">
		<!-- The interactive app types that the TV interactive app service supports.
		Reference to a string array resource that describes the supported types,
		e.g. HbbTv, Ginga. -->

media/java/android/media/tv/TvInputManager.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@ import android.graphics.Rect;
		import android.media.AudioDeviceInfo;
		import android.media.AudioFormat.Encoding;
		import android.media.PlaybackParams;
		import android.media.tv.interactive.TvIAppManager;
		import android.media.tv.interactive.TvInteractiveAppManager;
		import android.net.Uri;
		import android.os.Binder;
		import android.os.Bundle;
		@@ -2318,7 +2318,7 @@ public final class TvInputManager {
		// @GuardedBy("mMetadataLock")
		private int mVideoHeight;

		private TvIAppManager.Session mIAppSession;
		private TvInteractiveAppManager.Session mIAppSession;
		private boolean mIAppNotificationEnabled = false;

		private Session(IBinder token, InputChannel channel, ITvInputManager service, int userId,
		@@ -2331,11 +2331,11 @@ public final class TvInputManager {
		mSessionCallbackRecordMap = sessionCallbackRecordMap;
		}

		public TvIAppManager.Session getInteractiveAppSession() {
		public TvInteractiveAppManager.Session getInteractiveAppSession() {
		return mIAppSession;
		}

		public void setInteractiveAppSession(TvIAppManager.Session iAppSession) {
		public void setInteractiveAppSession(TvInteractiveAppManager.Session iAppSession) {
		this.mIAppSession = iAppSession;
		}