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

Commit 213f29f8 authored by David Zhao's avatar David Zhao Committed by Android (Google) Code Review
Browse files

Merge "Add requestSelectedTrackInfo" into main

parents 57cf5c70 4f19b4de

media/java/android/media/tv/interactive/ITvInteractiveAppClient.aidl

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ oneway interface ITvInteractiveAppClient { 
    void onRequestCurrentChannelLcn(int seq);

    void onRequestStreamVolume(int seq);

    void onRequestTrackInfoList(int seq);

    void onRequestSelectedTrackInfo(int seq);

    void onRequestCurrentTvInputId(int seq);

    void onRequestTimeShiftMode(int seq);

    void onRequestAvailableSpeeds(int seq);

media/java/android/media/tv/interactive/ITvInteractiveAppManager.aidl

+2 −0
Original line number Diff line number Diff line
@@ -102,6 +102,8 @@ interface ITvInteractiveAppManager { 
            int UserId);

    void notifyAdResponse(in IBinder sessionToken, in AdResponse response, int UserId);

    void notifyAdBufferConsumed(in IBinder sessionToken, in AdBuffer buffer, int userId);

    void sendSelectedTrackInfo(in IBinder sessionToken, in List<TvTrackInfo> tracks,

            int userId);



    void createMediaView(in IBinder sessionToken, in IBinder windowToken, in Rect frame,

            int userId);

media/java/android/media/tv/interactive/ITvInteractiveAppSession.aidl

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ oneway interface ITvInteractiveAppSession { 
    void notifyBroadcastInfoResponse(in BroadcastInfoResponse response);

    void notifyAdResponse(in AdResponse response);

    void notifyAdBufferConsumed(in AdBuffer buffer);

    void sendSelectedTrackInfo(in List<TvTrackInfo> tracks);



    void createMediaView(in IBinder windowToken, in Rect frame);

    void relayoutMediaView(in Rect frame);

media/java/android/media/tv/interactive/ITvInteractiveAppSessionCallback.aidl

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ oneway interface ITvInteractiveAppSessionCallback { 
    void onRequestCurrentTvInputId();

    void onRequestTimeShiftMode();

    void onRequestAvailableSpeeds();

    void onRequestSelectedTrackInfo();

    void onRequestStartRecording(in String requestId, in Uri programUri);

    void onRequestStopRecording(in String recordingId);

    void onRequestScheduleRecording(in String requestId, in String inputId, in Uri channelUri,

media/java/android/media/tv/interactive/ITvInteractiveAppSessionWrapper.java

+11 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ public class ITvInteractiveAppSessionWrapper 
    private static final int DO_NOTIFY_RECORDING_SCHEDULED = 45;

    private static final int DO_SEND_TIME_SHIFT_MODE = 46;

    private static final int DO_SEND_AVAILABLE_SPEEDS = 47;

    private static final int DO_SEND_SELECTED_TRACK_INFO = 48;



    private final HandlerCaller mCaller;

    private Session mSessionImpl;
@@ -247,6 +248,10 @@ public class ITvInteractiveAppSessionWrapper 
                args.recycle();

                break;

            }

            case DO_SEND_SELECTED_TRACK_INFO: {

                mSessionImpl.sendSelectedTrackInfo((List<TvTrackInfo>) msg.obj);

                break;

            }

            case DO_NOTIFY_VIDEO_AVAILABLE: {

                mSessionImpl.notifyVideoAvailable();

                break;
@@ -525,6 +530,12 @@ public class ITvInteractiveAppSessionWrapper 
                mCaller.obtainMessageOO(DO_NOTIFY_TV_MESSAGE, type, data));

    }



    @Override

    public void sendSelectedTrackInfo(List<TvTrackInfo> tracks) {

        mCaller.executeOrSendMessage(

                mCaller.obtainMessageO(DO_SEND_SELECTED_TRACK_INFO, tracks));

    }



    @Override

    public void notifyTracksChanged(List<TvTrackInfo> tracks) {

        mCaller.executeOrSendMessage(mCaller.obtainMessageO(DO_NOTIFY_TRACKS_CHANGED, tracks));