Merge "[CSAI API] Unhide app link APIs" into main (e934163d) · Commits · e / os / android_frameworks_base

core/api/current.txt

+12 −0

Original line number	Diff line number	Diff line
		@@ -27667,7 +27667,18 @@ package android.media.tv.ad {
		@FlaggedApi("android.media.tv.flags.enable_ad_service_fw") public class TvAdManager {
		method @NonNull public java.util.List<android.media.tv.ad.TvAdServiceInfo> getTvAdServiceList();
		method public void registerCallback(@NonNull java.util.concurrent.Executor, @NonNull android.media.tv.ad.TvAdManager.TvAdServiceCallback);
		method public void sendAppLinkCommand(@NonNull String, @NonNull android.os.Bundle);
		method public void unregisterCallback(@NonNull android.media.tv.ad.TvAdManager.TvAdServiceCallback);
		field public static final String ACTION_APP_LINK_COMMAND = "android.media.tv.ad.action.APP_LINK_COMMAND";
		field public static final String APP_LINK_KEY_BACK_URI = "back_uri";
		field public static final String APP_LINK_KEY_CLASS_NAME = "class_name";
		field public static final String APP_LINK_KEY_COMMAND_TYPE = "command_type";
		field public static final String APP_LINK_KEY_PACKAGE_NAME = "package_name";
		field public static final String APP_LINK_KEY_SERVICE_ID = "service_id";
		field public static final String INTENT_KEY_AD_SERVICE_ID = "ad_service_id";
		field public static final String INTENT_KEY_CHANNEL_URI = "channel_uri";
		field public static final String INTENT_KEY_COMMAND_TYPE = "command_type";
		field public static final String INTENT_KEY_TV_INPUT_ID = "tv_input_id";
		field public static final String SESSION_DATA_KEY_AD_BUFFER = "ad_buffer";
		field public static final String SESSION_DATA_KEY_AD_REQUEST = "ad_request";
		field public static final String SESSION_DATA_KEY_BROADCAST_INFO_REQUEST = "broadcast_info_request";
		@@ -27687,6 +27698,7 @@ package android.media.tv.ad {

		@FlaggedApi("android.media.tv.flags.enable_ad_service_fw") public abstract class TvAdService extends android.app.Service {
		ctor public TvAdService();
		method public void onAppLinkCommand(@NonNull android.os.Bundle);
		method @Nullable public final android.os.IBinder onBind(@Nullable android.content.Intent);
		method @Nullable public abstract android.media.tv.ad.TvAdService.Session onCreateSession(@NonNull String, @NonNull String);
		field public static final String SERVICE_INTERFACE = "android.media.tv.ad.TvAdService";

media/java/android/media/tv/ad/TvAdManager.java

+11 −12

Original line number	Diff line number	Diff line
		@@ -68,7 +68,6 @@ public class TvAdManager {
		* <p>Type: String
		*
		* @see #sendAppLinkCommand(String, Bundle)
		* @hide
		*/
		public static final String APP_LINK_KEY_PACKAGE_NAME = "package_name";

		@@ -77,7 +76,6 @@ public class TvAdManager {
		* <p>Type: String
		*
		* @see #sendAppLinkCommand(String, Bundle)
		* @hide
		*/
		public static final String APP_LINK_KEY_CLASS_NAME = "class_name";

		@@ -86,7 +84,6 @@ public class TvAdManager {
		* <p>Type: String
		*
		* @see #sendAppLinkCommand(String, Bundle)
		* @hide
		*/
		public static final String APP_LINK_KEY_COMMAND_TYPE = "command_type";

		@@ -95,7 +92,6 @@ public class TvAdManager {
		* <p>Type: String
		*
		* @see #sendAppLinkCommand(String, Bundle)
		* @hide
		*/
		public static final String APP_LINK_KEY_SERVICE_ID = "service_id";

		@@ -104,7 +100,6 @@ public class TvAdManager {
		* <p>Type: String
		*
		* @see #sendAppLinkCommand(String, Bundle)
		* @hide
		*/
		public static final String APP_LINK_KEY_BACK_URI = "back_uri";

		@@ -112,7 +107,6 @@ public class TvAdManager {
		* Broadcast intent action to send app command to TV app.
		*
		* @see #sendAppLinkCommand(String, Bundle)
		* @hide
		*/
		public static final String ACTION_APP_LINK_COMMAND =
		"android.media.tv.ad.action.APP_LINK_COMMAND";
		@@ -123,7 +117,6 @@ public class TvAdManager {
		*
		* @see #sendAppLinkCommand(String, Bundle)
		* @see #ACTION_APP_LINK_COMMAND
		* @hide
		*/
		public static final String INTENT_KEY_TV_INPUT_ID = "tv_input_id";

		@@ -134,7 +127,6 @@ public class TvAdManager {
		* @see #sendAppLinkCommand(String, Bundle)
		* @see #ACTION_APP_LINK_COMMAND
		* @see TvAdServiceInfo#getId()
		* @hide
		*/
		public static final String INTENT_KEY_AD_SERVICE_ID = "ad_service_id";

		@@ -144,7 +136,6 @@ public class TvAdManager {
		*
		* @see #sendAppLinkCommand(String, Bundle)
		* @see #ACTION_APP_LINK_COMMAND
		* @hide
		*/
		public static final String INTENT_KEY_CHANNEL_URI = "channel_uri";

		@@ -155,7 +146,6 @@ public class TvAdManager {
		*
		* @see #sendAppLinkCommand(String, Bundle)
		* @see #ACTION_APP_LINK_COMMAND
		* @hide
		*/
		public static final String INTENT_KEY_COMMAND_TYPE = "command_type";

		@@ -486,8 +476,17 @@ public class TvAdManager {
		*
		* @param serviceId The ID of TV AD service which the command to be sent to. The ID can be found
		* in {@link TvAdServiceInfo#getId()}.
		* @param command The command to be sent.
		* @hide
		* @param command The command to be sent. The command is a bundle with the following keys:
		* <ul>
		* <li>{@link #APP_LINK_KEY_PACKAGE_NAME}: The package name of the app to be
		* launched.
		* <li>{@link #APP_LINK_KEY_CLASS_NAME}: The class name of the app to be
		* launched.
		* <li>{@link #APP_LINK_KEY_COMMAND_TYPE}: The command type.
		* <li>{@link #APP_LINK_KEY_SERVICE_ID}: The ID of the TV AD service.
		* <li>{@link #APP_LINK_KEY_BACK_URI}: The URI to be used to return to the
		* previous app.
		* </ul>
		*/
		public void sendAppLinkCommand(@NonNull String serviceId, @NonNull Bundle command) {
		try {

media/java/android/media/tv/ad/TvAdService.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -136,7 +136,6 @@ public abstract class TvAdService extends Service {
		* Called when app link command is received.
		*
		* @see TvAdManager#sendAppLinkCommand(String, Bundle)
		* @hide
		*/
		public void onAppLinkCommand(@NonNull Bundle command) {
		}