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

Commit bf51ce6e authored by shubang's avatar shubang
Browse files

[TIAF] Unhide stop mode and video bounds APIs 

Bug: 264934231
Test: TvInteractiveAppServiceTest#testSendCurrentVideoBounds
Test: TvInteractiveAppServiceTest#testRequestCurrentVideoBounds

Change-Id: I57392eb5802ce9902d398702599e0c1216dc6711
parent f1b0ee9a

core/api/current.txt

+15 −0
Original line number Diff line number Diff line
@@ -26536,8 +26536,16 @@ package android.media.tv { 
    method public int getTableName();

    method public int getVersion();

    field @NonNull public static final android.os.Parcelable.Creator<android.media.tv.TableRequest> CREATOR;

    field public static final int TABLE_NAME_BAT = 4; // 0x4

    field public static final int TABLE_NAME_CAT = 2; // 0x2

    field public static final int TABLE_NAME_EIT = 6; // 0x6

    field public static final int TABLE_NAME_NIT = 3; // 0x3

    field public static final int TABLE_NAME_PAT = 0; // 0x0

    field public static final int TABLE_NAME_PMT = 1; // 0x1

    field public static final int TABLE_NAME_SDT = 5; // 0x5

    field public static final int TABLE_NAME_SIT = 9; // 0x9

    field public static final int TABLE_NAME_TDT = 7; // 0x7

    field public static final int TABLE_NAME_TOT = 8; // 0x8

  }















  public final class TableResponse extends android.media.tv.BroadcastInfoResponse implements android.os.Parcelable {










@@ -27450,9 +27458,12 @@ package android.media.tv.interactive {













    field public static final String COMMAND_PARAMETER_KEY_CHANGE_CHANNEL_QUIETLY = "command_change_channel_quietly";















    field public static final String COMMAND_PARAMETER_KEY_CHANNEL_URI = "command_channel_uri";















    field public static final String COMMAND_PARAMETER_KEY_INPUT_ID = "command_input_id";













    field public static final String COMMAND_PARAMETER_KEY_STOP_MODE = "command_stop_mode";















    field public static final String COMMAND_PARAMETER_KEY_TRACK_ID = "command_track_id";















    field public static final String COMMAND_PARAMETER_KEY_TRACK_TYPE = "command_track_type";















    field public static final String COMMAND_PARAMETER_KEY_VOLUME = "command_volume";













    field public static final int COMMAND_PARAMETER_VALUE_STOP_MODE_BLANK = 1; // 0x1













    field public static final int COMMAND_PARAMETER_VALUE_STOP_MODE_FREEZE = 2; // 0x2















    field public static final String PLAYBACK_COMMAND_TYPE_SELECT_TRACK = "select_track";















    field public static final String PLAYBACK_COMMAND_TYPE_SET_STREAM_VOLUME = "set_stream_volume";















    field public static final String PLAYBACK_COMMAND_TYPE_STOP = "stop";










@@ -27481,6 +27492,7 @@ package android.media.tv.interactive {













    method public void onCurrentChannelLcn(int);















    method public void onCurrentChannelUri(@Nullable android.net.Uri);















    method public void onCurrentTvInputId(@Nullable String);













    method public void onCurrentVideoBounds(@NonNull android.graphics.Rect);















    method public void onDestroyBiInteractiveAppRequest(@NonNull String);















    method public void onError(@NonNull String, @NonNull android.os.Bundle);















    method public boolean onGenericMotionEvent(@NonNull android.view.MotionEvent);










@@ -27518,6 +27530,7 @@ package android.media.tv.interactive {













    method @CallSuper public void requestCurrentChannelLcn();















    method @CallSuper public void requestCurrentChannelUri();















    method @CallSuper public void requestCurrentTvInputId();













    method @CallSuper public void requestCurrentVideoBounds();















    method @CallSuper public void requestSigning(@NonNull String, @NonNull String, @NonNull String, @NonNull byte[]);















    method @CallSuper public void requestStartRecording(@Nullable android.net.Uri);















    method @CallSuper public void requestStopRecording(@NonNull String);










@@ -27570,6 +27583,7 @@ package android.media.tv.interactive {













    method public void sendCurrentChannelLcn(int);















    method public void sendCurrentChannelUri(@Nullable android.net.Uri);















    method public void sendCurrentTvInputId(@Nullable String);













    method public void sendCurrentVideoBounds(@NonNull android.graphics.Rect);















    method public void sendSigningResult(@NonNull String, @NonNull byte[]);















    method public void sendStreamVolume(float);















    method public void sendTrackInfoList(@Nullable java.util.List<android.media.tv.TvTrackInfo>);










@@ -27600,6 +27614,7 @@ package android.media.tv.interactive {













    method public void onRequestCurrentChannelLcn(@NonNull String);















    method public void onRequestCurrentChannelUri(@NonNull String);















    method public void onRequestCurrentTvInputId(@NonNull String);













    method public void onRequestCurrentVideoBounds(@NonNull String);















    method public void onRequestSigning(@NonNull String, @NonNull String, @NonNull String, @NonNull String, @NonNull byte[]);















    method public void onRequestStartRecording(@NonNull String, @Nullable android.net.Uri);















    method public void onRequestStopRecording(@NonNull String, @NonNull String);

























media/java/android/media/tv/TableRequest.java



+2
−9




























Original line number
Diff line number
Diff line








@@ -33,7 +33,8 @@ public final class TableRequest extends BroadcastInfoRequest implements Parcelab





























    /** @hide */















    @Retention(RetentionPolicy.SOURCE)













    @IntDef({TABLE_NAME_PAT, TABLE_NAME_PMT, TABLE_NAME_CAT})













    @IntDef({TABLE_NAME_PAT, TABLE_NAME_PMT, TABLE_NAME_CAT, TABLE_NAME_NIT, TABLE_NAME_BAT,













            TABLE_NAME_SDT, TABLE_NAME_EIT, TABLE_NAME_TDT, TABLE_NAME_TOT, TABLE_NAME_SIT})















    public @interface TableName {}































    /** Program Association Table */









@@ -42,42 +43,34 @@ public final class TableRequest extends BroadcastInfoRequest implements Parcelab













    public static final int TABLE_NAME_PMT = 1;















    /**















     * Conditional Access Table













     * @hide















     */















    public static final int TABLE_NAME_CAT = 2;















    /**















     * Network Information Table













     * @hide















     */















    public static final int TABLE_NAME_NIT = 3;















    /**















     * Bouquet Association Table













     * @hide















     */















    public static final int TABLE_NAME_BAT = 4;















    /**















     * Service Description Table













     * @hide















     */















    public static final int TABLE_NAME_SDT = 5;















    /**















     * Event Information Table













     * @hide















     */















    public static final int TABLE_NAME_EIT = 6;















    /**















     * Time and Date Table













     * @hide















     */















    public static final int TABLE_NAME_TDT = 7;















    /**















     * Time Offset Table













     * @hide















     */















    public static final int TABLE_NAME_TOT = 8;















    /**















     * Selection Information Table













     * @hide















     */















    public static final int TABLE_NAME_SIT = 9;

















































media/java/android/media/tv/interactive/TvInteractiveAppService.java



+9
−10




























Original line number
Diff line number
Diff line








@@ -145,30 +145,29 @@ public abstract class TvInteractiveAppService extends Service {





























    /** @hide */















    @Retention(RetentionPolicy.SOURCE)













    @IntDef(prefix = "PLAYBACK_COMMAND_STOP_MODE_", value = {













            PLAYBACK_COMMAND_STOP_MODE_BLANK,













            PLAYBACK_COMMAND_STOP_MODE_FREEZE













    @IntDef(prefix = "COMMAND_PARAMETER_VALUE_STOP_MODE_", value = {













            COMMAND_PARAMETER_VALUE_STOP_MODE_BLANK,













            COMMAND_PARAMETER_VALUE_STOP_MODE_FREEZE















    })















    public @interface PlaybackCommandStopMode {}































    /**















     * Playback command stop mode: show a blank screen.













     * @hide













     * @see #PLAYBACK_COMMAND_TYPE_STOP















     */













    public static final int PLAYBACK_COMMAND_STOP_MODE_BLANK = 1;













    public static final int COMMAND_PARAMETER_VALUE_STOP_MODE_BLANK = 1;































    /**















     * Playback command stop mode: freeze the video.













     * @hide













     * @see #PLAYBACK_COMMAND_TYPE_STOP















     */













    public static final int PLAYBACK_COMMAND_STOP_MODE_FREEZE = 2;













    public static final int COMMAND_PARAMETER_VALUE_STOP_MODE_FREEZE = 2;































    /**















     * Playback command parameter: stop mode.















     * <p>Type: int















     *















     * @see #PLAYBACK_COMMAND_TYPE_STOP













     * @hide















     */















    public static final String COMMAND_PARAMETER_KEY_STOP_MODE = "command_stop_mode";


























@@ -550,7 +549,8 @@ public abstract class TvInteractiveAppService extends Service {





























        /**















         * Receives current video bounds.













         * @hide













         *













         * @param bounds the rectangle area for rendering the current video.















         */















        public void onCurrentVideoBounds(@NonNull Rect bounds) {















        }










@@ -1135,7 +1135,6 @@ public abstract class TvInteractiveAppService extends Service {





























        /**















         * Requests the bounds of the current video.













         * @hide















         */















        @CallSuper















        public void requestCurrentVideoBounds() {

































media/java/android/media/tv/interactive/TvInteractiveAppView.java



+2
−2




























Original line number
Diff line number
Diff line








@@ -516,7 +516,8 @@ public class TvInteractiveAppView extends ViewGroup {





























    /**















     * Sends current video bounds to related TV interactive app.













     * @hide













     *













     * @param bounds the rectangle area for rendering the current video.















     */















    public void sendCurrentVideoBounds(@NonNull Rect bounds) {















        if (DEBUG) {










@@ -1131,7 +1132,6 @@ public class TvInteractiveAppView extends ViewGroup {













         * is called.















         *















         * @param iAppServiceId The ID of the TV interactive app service bound to this view.













         * @hide















         */















        public void onRequestCurrentVideoBounds(@NonNull String iAppServiceId) {















        }