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

Commit c1a83506 authored by David Zhao's avatar David Zhao
Browse files

Unhide requestSelectedTrackInfo 

Bug: 309561696
Test: atest TvInteractiveAppServiceTest
Change-Id: I043f3c86ab1049536752269735279a09bef90705
parent 56bff5c8

core/api/current.txt

+4 −0
Original line number Diff line number Diff line
@@ -27746,6 +27746,7 @@ package android.media.tv.interactive { 
    method public void onRecordingTuned(@NonNull String, @NonNull android.net.Uri);

    method public abstract void onRelease();

    method public void onResetInteractiveApp();

    method @FlaggedApi("android.media.tv.flags.tiaf_v_apis") public void onSelectedTrackInfo(@NonNull java.util.List<android.media.tv.TvTrackInfo>);

    method public abstract boolean onSetSurface(@Nullable android.view.Surface);

    method public void onSetTeletextAppEnabled(boolean);

    method public void onSignalStrength(int);
@@ -27780,6 +27781,7 @@ package android.media.tv.interactive { 
    method @CallSuper public void requestCurrentVideoBounds();

    method @CallSuper public void requestScheduleRecording(@NonNull String, @NonNull String, @NonNull android.net.Uri, @NonNull android.net.Uri, @NonNull android.os.Bundle);

    method @CallSuper public void requestScheduleRecording(@NonNull String, @NonNull String, @NonNull android.net.Uri, long, long, int, @NonNull android.os.Bundle);

    method @FlaggedApi("android.media.tv.flags.tiaf_v_apis") @CallSuper public void requestSelectedTrackInfo();

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

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

    method @CallSuper public void requestStopRecording(@NonNull String);
@@ -27844,6 +27846,7 @@ package android.media.tv.interactive { 
    method public void sendCurrentChannelUri(@Nullable android.net.Uri);

    method public void sendCurrentTvInputId(@Nullable String);

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

    method @FlaggedApi("android.media.tv.flags.tiaf_v_apis") public void sendSelectedTrackInfo(@Nullable java.util.List<android.media.tv.TvTrackInfo>);

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

    method public void sendStreamVolume(float);

    method public void sendTimeShiftMode(int);
@@ -27879,6 +27882,7 @@ package android.media.tv.interactive { 
    method public void onRequestCurrentVideoBounds(@NonNull String);

    method public void onRequestScheduleRecording(@NonNull String, @NonNull String, @NonNull String, @NonNull android.net.Uri, @NonNull android.net.Uri, @NonNull android.os.Bundle);

    method public void onRequestScheduleRecording(@NonNull String, @NonNull String, @NonNull String, @NonNull android.net.Uri, long, long, int, @NonNull android.os.Bundle);

    method @FlaggedApi("android.media.tv.flags.tiaf_v_apis") public void onRequestSelectedTrackInfo(@NonNull String);

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

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

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

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

+10 −8
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.media.tv.interactive;



import android.annotation.CallSuper;

import android.annotation.FlaggedApi;

import android.annotation.IntDef;

import android.annotation.MainThread;

import android.annotation.NonNull;
@@ -44,6 +45,7 @@ import android.media.tv.TvInputManager; 
import android.media.tv.TvRecordingInfo;

import android.media.tv.TvTrackInfo;

import android.media.tv.TvView;

import android.media.tv.flags.Flags;

import android.media.tv.interactive.TvInteractiveAppView.TvInteractiveAppCallback;

import android.net.Uri;

import android.net.http.SslCertificate;
@@ -959,12 +961,12 @@ public abstract class TvInteractiveAppService extends Service { 


        /**

         * Called when the TV App sends the selected track info as a response to

         * requestSelectedTrackInfo.

         * {@link #requestSelectedTrackInfo()}

         *

         * @param tracks

         * @hide

         * @param tracks A list of {@link TvTrackInfo} that are currently selected

         */

        public void onSelectedTrackInfo(List<TvTrackInfo> tracks) {

        @FlaggedApi(Flags.FLAG_TIAF_V_APIS)

        public void onSelectedTrackInfo(@NonNull List<TvTrackInfo> tracks) {

        }



        @Override
@@ -1373,13 +1375,13 @@ public abstract class TvInteractiveAppService extends Service { 
        }



        /**

         * Requests the currently selected {@link TvTrackInfo} from the TV App.

         * Requests a list of the currently selected {@link TvTrackInfo} from the TV App.

         *

         * <p> Normally, track info cannot be synchronized until the channel has

         * been changed. This is used when the session of the TIAS is newly

         * created and the normal synchronization has not happened yet.

         * @hide

         * been changed. This is used when the session of the {@link TvInteractiveAppService}

         * is newly created and the normal synchronization has not happened yet.

         */

        @FlaggedApi(Flags.FLAG_TIAF_V_APIS)

        @CallSuper

        public void requestSelectedTrackInfo() {

            executeOrPostRunnableOnMainThread(() -> {

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

+5 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.media.tv.interactive;



import android.annotation.CallbackExecutor;

import android.annotation.FlaggedApi;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.content.Context;
@@ -30,6 +31,7 @@ import android.media.tv.TvInputManager; 
import android.media.tv.TvRecordingInfo;

import android.media.tv.TvTrackInfo;

import android.media.tv.TvView;

import android.media.tv.flags.Flags;

import android.media.tv.interactive.TvInteractiveAppManager.Session;

import android.media.tv.interactive.TvInteractiveAppManager.Session.FinishedInputEventCallback;

import android.media.tv.interactive.TvInteractiveAppManager.SessionCallback;
@@ -585,8 +587,9 @@ public class TvInteractiveAppView extends ViewGroup { 
    /**

     * Sends the currently selected track info to the TV Interactive App.

     *

     * @hide

     * @param tracks list of {@link TvTrackInfo} of the currently selected track(s)

     */

    @FlaggedApi(Flags.FLAG_TIAF_V_APIS)

    public void sendSelectedTrackInfo(@Nullable List<TvTrackInfo> tracks) {

        if (DEBUG) {

            Log.d(TAG, "sendSelectedTrackInfo");
@@ -1248,8 +1251,8 @@ public class TvInteractiveAppView extends ViewGroup { 
         * called.

         *

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

         * @hide

         */

        @FlaggedApi(Flags.FLAG_TIAF_V_APIS)

        public void onRequestSelectedTrackInfo(@NonNull String iAppServiceId) {

        }