Merge "[TIAF] unhide extra IApp types and AppLinkInfo APIs" (557dc231) · Commits · e / os / android_frameworks_base

core/api/current.txt

+4 −0

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

		public final class TvInteractiveAppManager {
		method @NonNull public java.util.List<android.media.tv.interactive.AppLinkInfo> getAppLinkInfoList();
		method @NonNull public java.util.List<android.media.tv.interactive.TvInteractiveAppServiceInfo> getTvInteractiveAppServiceList();
		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);
		@@ -27651,6 +27652,7 @@ package android.media.tv.interactive {
		public final class TvInteractiveAppServiceInfo implements android.os.Parcelable {
		ctor public TvInteractiveAppServiceInfo(@NonNull android.content.Context, @NonNull android.content.ComponentName);
		method public int describeContents();
		method @NonNull public java.util.List<java.lang.String> getCustomSupportedTypes();
		method @NonNull public String getId();
		method @Nullable public android.content.pm.ServiceInfo getServiceInfo();
		method @NonNull public int getSupportedTypes();
		@@ -27659,6 +27661,8 @@ package android.media.tv.interactive {
		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
		field public static final int INTERACTIVE_APP_TYPE_OTHER = -2147483648; // 0x80000000
		field public static final int INTERACTIVE_APP_TYPE_TARGETED_AD = 8; // 0x8
		}

		public class TvInteractiveAppView extends android.view.ViewGroup {

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -935,7 +935,6 @@ public final class TvInteractiveAppManager {
		* can be detected by the system.
		*
		* @return List of {@link AppLinkInfo} for each package that deslares its app link information.
		* @hide
		*/
		@NonNull
		public List<AppLinkInfo> getAppLinkInfoList() {

media/java/android/media/tv/interactive/TvInteractiveAppServiceInfo.java

+18 −12

Original line number	Diff line number	Diff line
		@@ -68,15 +68,9 @@ public final class TvInteractiveAppServiceInfo implements Parcelable {
		public static final int INTERACTIVE_APP_TYPE_ATSC = 0x2;
		/** Ginga interactive app type */
		public static final int INTERACTIVE_APP_TYPE_GINGA = 0x4;
		/**
		* Targeted Advertisement interactive app type
		* @hide
		*/
		/** Targeted Advertisement interactive app type */
		public static final int INTERACTIVE_APP_TYPE_TARGETED_AD = 0x8;
		/**
		* Other interactive app type
		* @hide
		*/
		/** Other interactive app type */
		public static final int INTERACTIVE_APP_TYPE_OTHER = 0x80000000;

		private final ResolveInfo mService;
		@@ -180,7 +174,20 @@ public final class TvInteractiveAppServiceInfo implements Parcelable {
		}

		/**
		* Gets supported interactive app types
		* Gets supported interactive app types.
		*
		* <p>The supported interactive app types is in a bit map format. For example:
		* <pre><code>
		* int types = tvInteractiveAppInfo.getSupportedTypes();
		* if (types & TvInteractiveAppInfo.INTERACTIVE_APP_TYPE_HBBTV != 0) {
		* // HbbTV type is supported. Do something...
		* }
		* if (types & TvInteractiveAppInfo.INTERACTIVE_APP_TYPE_ATSC == 0) {
		* // ATSC type is not supported. Do something...
		* }
		* </code></pre>
		*
		* @return An int bit map representing supported types.
		*/
		@InteractiveAppType
		@NonNull
		@@ -189,13 +196,12 @@ public final class TvInteractiveAppServiceInfo implements Parcelable {
		}

		/**
		* Gets extra supported interactive app types which are not listed.
		* Gets custom supported interactive app types which are not listed.
		*
		* @see #getSupportedTypes()
		* @hide
		*/
		@NonNull
		public List<String> getExtraSupportedTypes() {
		public List<String> getCustomSupportedTypes() {
		return mExtraTypes;
		}