Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85aaa4aa authored by shubang's avatar shubang
Browse files

TIAF: unhide use cases VOD to DTV & AD insertion

Bug: 211886434
Bug: 215521812
Test: atest android.media.tv.interactive.cts.TvInteractiveAppManagerTest
Test: atest android.media.tv.interactive.cts.TvInteractiveAppServiceTest
Change-Id: Iee3c0fa5297417876b385f4fe05a91ed9c66d000
parent eed4b392
Loading
Loading
Loading
Loading
+42 −0
Original line number Diff line number Diff line
@@ -26178,6 +26178,37 @@ package android.media.session {
package android.media.tv {
  public final class AdRequest implements android.os.Parcelable {
    ctor public AdRequest(int, int, @Nullable android.os.ParcelFileDescriptor, long, long, long, @Nullable String, @NonNull android.os.Bundle);
    method public int describeContents();
    method public long getEchoIntervalMillis();
    method @Nullable public android.os.ParcelFileDescriptor getFileDescriptor();
    method public int getId();
    method @Nullable public String getMediaFileType();
    method @NonNull public android.os.Bundle getMetadata();
    method public int getRequestType();
    method public long getStartTimeMillis();
    method public long getStopTimeMillis();
    method public void writeToParcel(@NonNull android.os.Parcel, int);
    field @NonNull public static final android.os.Parcelable.Creator<android.media.tv.AdRequest> CREATOR;
    field public static final int REQUEST_TYPE_START = 1; // 0x1
    field public static final int REQUEST_TYPE_STOP = 2; // 0x2
  }
  public final class AdResponse implements android.os.Parcelable {
    ctor public AdResponse(int, int, long);
    method public int describeContents();
    method public long getElapsedTimeMillis();
    method public int getId();
    method public int getResponseType();
    method public void writeToParcel(@NonNull android.os.Parcel, int);
    field @NonNull public static final android.os.Parcelable.Creator<android.media.tv.AdResponse> CREATOR;
    field public static final int RESPONSE_TYPE_ERROR = 4; // 0x4
    field public static final int RESPONSE_TYPE_FINISHED = 2; // 0x2
    field public static final int RESPONSE_TYPE_PLAYING = 1; // 0x1
    field public static final int RESPONSE_TYPE_STOPPED = 3; // 0x3
  }
  public final class AitInfo implements android.os.Parcelable {
    ctor public AitInfo(int, int);
    method public int describeContents();
@@ -26757,6 +26788,7 @@ package android.media.tv {
  public abstract static class TvInputService.Session implements android.view.KeyEvent.Callback {
    ctor public TvInputService.Session(android.content.Context);
    method public void layoutSurface(int, int, int, int);
    method public void notifyAdResponse(@NonNull android.media.tv.AdResponse);
    method public void notifyAitInfoUpdated(@NonNull android.media.tv.AitInfo);
    method public void notifyChannelRetuned(android.net.Uri);
    method public void notifyContentAllowed();
@@ -26776,6 +26808,7 @@ package android.media.tv {
    method public boolean onKeyUp(int, android.view.KeyEvent);
    method public void onOverlayViewSizeChanged(int, int);
    method public abstract void onRelease();
    method public void onRequestAd(@NonNull android.media.tv.AdRequest);
    method public boolean onSelectTrack(int, @Nullable String);
    method public abstract void onSetCaptionEnabled(boolean);
    method public void onSetInteractiveAppNotificationEnabled(boolean);
@@ -26941,6 +26974,7 @@ package android.media.tv.interactive {
  public final class TvInteractiveAppManager {
    method @NonNull public java.util.List<android.media.tv.interactive.TvInteractiveAppInfo> getTvInteractiveAppServiceList();
    method public void registerCallback(@NonNull android.media.tv.interactive.TvInteractiveAppManager.TvInteractiveAppCallback, @NonNull java.util.concurrent.Executor);
    method public void sendAppLinkCommand(@NonNull String, @NonNull android.os.Bundle);
    method public void unregisterCallback(@NonNull android.media.tv.interactive.TvInteractiveAppManager.TvInteractiveAppCallback);
    field public static final int ERROR_BLOCKED = 5; // 0x5
    field public static final int ERROR_ENCRYPTED = 6; // 0x6
@@ -26953,6 +26987,11 @@ package android.media.tv.interactive {
    field public static final int INTERACTIVE_APP_STATE_ERROR = 3; // 0x3
    field public static final int INTERACTIVE_APP_STATE_RUNNING = 2; // 0x2
    field public static final int INTERACTIVE_APP_STATE_STOPPED = 1; // 0x1
    field public static final String KEY_BACK_URI = "back_uri";
    field public static final String KEY_CLASS_NAME = "class_name";
    field public static final String KEY_COMMAND_TYPE = "command_type";
    field public static final String KEY_PACKAGE_NAME = "package_name";
    field public static final String KEY_SERVICE_ID = "service_id";
    field public static final int SERVICE_STATE_ERROR = 4; // 0x4
    field public static final int SERVICE_STATE_PREPARING = 2; // 0x2
    field public static final int SERVICE_STATE_READY = 3; // 0x3
@@ -26967,6 +27006,7 @@ package android.media.tv.interactive {
  public abstract class TvInteractiveAppService extends android.app.Service {
    ctor public TvInteractiveAppService();
    method public final void notifyStateChanged(int, int, int);
    method public void onAppLinkCommand(@NonNull android.os.Bundle);
    method public final android.os.IBinder onBind(android.content.Intent);
    method @Nullable public abstract android.media.tv.interactive.TvInteractiveAppService.Session onCreateSession(@NonNull String, int);
    method public abstract void onPrepare(int);
@@ -26979,6 +27019,7 @@ package android.media.tv.interactive {
    method public void layoutSurface(int, int, int, int);
    method public final void notifyBiInteractiveAppCreated(@NonNull android.net.Uri, @Nullable String);
    method public void notifySessionStateChanged(int, int);
    method public void onAdResponse(@NonNull android.media.tv.AdResponse);
    method public void onCreateBiInteractiveApp(@NonNull android.net.Uri, @Nullable android.os.Bundle);
    method public void onDestroyBiInteractiveApp(@NonNull String);
    method public boolean onKeyDown(int, @NonNull android.view.KeyEvent);
@@ -26990,6 +27031,7 @@ package android.media.tv.interactive {
    method public void onStopInteractiveApp();
    method public void onSurfaceChanged(int, int, int);
    method public void onTuned(@NonNull android.net.Uri);
    method public void requestAd(@NonNull android.media.tv.AdRequest);
  }
  public class TvInteractiveAppView extends android.view.ViewGroup {
+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ import java.lang.annotation.RetentionPolicy;

/**
 * An advertisement request which can be sent to TV input to request AD operations.
 * @hide
 */
public final class AdRequest implements Parcelable {
    /** @hide */
+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import java.lang.annotation.RetentionPolicy;

/**
 * An advertisement request which can be sent to TV interactive App service to inform AD status.
 * @hide
 */
public final class AdResponse implements Parcelable {
    /** @hide */
+0 −2
Original line number Diff line number Diff line
@@ -896,7 +896,6 @@ public abstract class TvInputService extends Service {
         *
         * @param response advertisement response.
         * @see android.media.tv.interactive.TvInteractiveAppService.Session#requestAd(AdRequest)
         * @hide
         */
        public void notifyAdResponse(@NonNull final AdResponse response) {
            executeOrPostRunnableOnMainThread(new Runnable() {
@@ -1128,7 +1127,6 @@ public abstract class TvInputService extends Service {
         * Called when advertisement request is received.
         *
         * @param request advertisement request received
         * @hide
         */
        public void onRequestAd(@NonNull AdRequest request) {
        }
+0 −8
Original line number Diff line number Diff line
@@ -193,9 +193,7 @@ public final class TvInteractiveAppManager {
     * Key for package name in app link.
     * <p>Type: String
     *
     * @see #registerAppLinkInfo(String, Bundle)
     * @see #sendAppLinkCommand(String, Bundle)
     * @hide
     */
    public static final String KEY_PACKAGE_NAME = "package_name";

@@ -203,9 +201,7 @@ public final class TvInteractiveAppManager {
     * Key for class name in app link.
     * <p>Type: String
     *
     * @see #registerAppLinkInfo(String, Bundle)
     * @see #sendAppLinkCommand(String, Bundle)
     * @hide
     */
    public static final String KEY_CLASS_NAME = "class_name";

@@ -241,7 +237,6 @@ public final class TvInteractiveAppManager {
     * <p>Type: String
     *
     * @see #sendAppLinkCommand(String, Bundle)
     * @hide
     */
    public static final String KEY_COMMAND_TYPE = "command_type";

@@ -250,7 +245,6 @@ public final class TvInteractiveAppManager {
     * <p>Type: String
     *
     * @see #sendAppLinkCommand(String, Bundle)
     * @hide
     */
    public static final String KEY_SERVICE_ID = "service_id";

@@ -259,7 +253,6 @@ public final class TvInteractiveAppManager {
     * <p>Type: String
     *
     * @see #sendAppLinkCommand(String, Bundle)
     * @hide
     */
    public static final String KEY_BACK_URI = "back_uri";

@@ -773,7 +766,6 @@ public final class TvInteractiveAppManager {
     * @param tvIAppServiceId The ID of TV interactive service which the command to be sent to. The
     *                        ID can be found in {@link TvInputInfo#getId()}.
     * @param command The command to be sent.
     * @hide
     */
    public void sendAppLinkCommand(@NonNull String tvIAppServiceId, @NonNull Bundle command) {
        try {
Loading