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

Commit 94d42cc7 authored by Shubang Lu's avatar Shubang Lu Committed by Android (Google) Code Review
Browse files

Merge changes Ifa5bb06f,Ie9793424 

* changes:
  [TIAF] Add more time shift APIs
  [TIAF] Add recording callback and cueing message APIs
parents b2e6325b 528c42e7

media/java/android/media/tv/ITvInputClient.aidl

+3 −0
Original line number Diff line number Diff line
@@ -52,6 +52,9 @@ oneway interface ITvInputClient { 
    void onTimeShiftCurrentPositionChanged(long timeMs, int seq);

    void onAitInfoUpdated(in AitInfo aitInfo, int seq);

    void onSignalStrength(int stength, int seq);

    void onCueingMessageAvailability(boolean available, int seq);

    void onTimeShiftMode(int mode, int seq);

    void onAvailableSpeeds(in float[] speeds, int seq);

    void onTvMessage(in String type, in Bundle data, int seq);



    void onTuned(in Uri channelUri, int seq);

media/java/android/media/tv/ITvInputManager.aidl

+1 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ interface ITvInputManager { 
    void timeShiftResume(in IBinder sessionToken, int userId);

    void timeShiftSeekTo(in IBinder sessionToken, long timeMs, int userId);

    void timeShiftSetPlaybackParams(in IBinder sessionToken, in PlaybackParams params, int userId);

    void timeShiftSetMode(in IBinder sessionToken, int mode, int userId);

    void timeShiftEnablePositionTracking(in IBinder sessionToken, boolean enable, int userId);



    List<TunedInfo> getCurrentTunedInfos(int userId);

media/java/android/media/tv/ITvInputSession.aidl

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ oneway interface ITvInputSession { 
    void timeShiftResume();

    void timeShiftSeekTo(long timeMs);

    void timeShiftSetPlaybackParams(in PlaybackParams params);

    void timeShiftSetMode(int mode);

    void timeShiftEnablePositionTracking(boolean enable);



    // For the recording session

media/java/android/media/tv/ITvInputSessionCallback.aidl

+3 −0
Original line number Diff line number Diff line
@@ -49,6 +49,9 @@ oneway interface ITvInputSessionCallback { 
    void onTimeShiftCurrentPositionChanged(long timeMs);

    void onAitInfoUpdated(in AitInfo aitInfo);

    void onSignalStrength(int strength);

    void onCueingMessageAvailability(boolean available);

    void onTimeShiftMode(int mode);

    void onAvailableSpeeds(in float[] speeds);



    // For the recording session

    void onTuned(in Uri channelUri);

media/java/android/media/tv/ITvInputSessionWrapper.java

+10 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.view.InputChannel; 
import android.view.InputEvent;

import android.view.InputEventReceiver;

import android.view.Surface;



import com.android.internal.os.HandlerCaller;

import com.android.internal.os.SomeArgs;
@@ -75,6 +76,7 @@ public class ITvInputSessionWrapper extends ITvInputSession.Stub implements Hand 
    private static final int DO_REQUEST_AD = 27;

    private static final int DO_NOTIFY_AD_BUFFER = 28;

    private static final int DO_SELECT_AUDIO_PRESENTATION = 29;

    private static final int DO_TIME_SHIFT_SET_MODE = 30;



    private final boolean mIsRecordingSession;

    private final HandlerCaller mCaller;
@@ -218,6 +220,9 @@ public class ITvInputSessionWrapper extends ITvInputSession.Stub implements Hand 
                mTvInputSessionImpl.timeShiftSetPlaybackParams((PlaybackParams) msg.obj);

                break;

            }

            case DO_TIME_SHIFT_SET_MODE: {

                mTvInputSessionImpl.timeShiftSetMode((Integer) msg.obj);

            }

            case DO_TIME_SHIFT_ENABLE_POSITION_TRACKING: {

                mTvInputSessionImpl.timeShiftEnablePositionTracking((Boolean) msg.obj);

                break;
@@ -400,6 +405,11 @@ public class ITvInputSessionWrapper extends ITvInputSession.Stub implements Hand 
                params));

    }



    @Override

    public void timeShiftSetMode(int mode) {

        mCaller.executeOrSendMessage(mCaller.obtainMessageI(DO_TIME_SHIFT_SET_MODE, mode));

    }



    @Override

    public void timeShiftEnablePositionTracking(boolean enable) {

        mCaller.executeOrSendMessage(mCaller.obtainMessageO(