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

Commit 1df5bd76 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "TIF: DVR API customization"

parents d3b4ec5d 7f3f8c1f

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -29200,6 +29200,7 @@ package android.media.tv { 
    method public void onAppPrivateCommand(@NonNull String, android.os.Bundle);

    method public abstract void onRelease();

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

    method public void onStartRecording(@Nullable android.net.Uri, @NonNull android.os.Bundle);

    method public abstract void onStopRecording();

    method public abstract void onTune(android.net.Uri);

    method public void onTune(android.net.Uri, android.os.Bundle);
@@ -29250,6 +29251,7 @@ package android.media.tv { 
    method public void release();

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

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

    method public void startRecording(@Nullable android.net.Uri, @NonNull android.os.Bundle);

    method public void stopRecording();

    method public void tune(String, android.net.Uri);

    method public void tune(String, android.net.Uri, android.os.Bundle);

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

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ interface ITvInputManager { 
    void timeShiftEnablePositionTracking(in IBinder sessionToken, boolean enable, int userId);



    // For the recording session

    void startRecording(in IBinder sessionToken, in Uri programUri, int userId);

    void startRecording(in IBinder sessionToken, in Uri programUri, in Bundle params, int userId);

    void stopRecording(in IBinder sessionToken, int userId);



    // For TV input hardware binding

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

+1 −1
Original line number Diff line number Diff line
@@ -56,6 +56,6 @@ oneway interface ITvInputSession { 
    void timeShiftEnablePositionTracking(boolean enable);



    // For the recording session

    void startRecording(in Uri programUri);

    void startRecording(in Uri programUri, in Bundle params);

    void stopRecording();

}

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

+5 −3
Original line number Diff line number Diff line
@@ -216,7 +216,8 @@ public class ITvInputSessionWrapper extends ITvInputSession.Stub implements Hand 
                break;

            }

            case DO_START_RECORDING: {

                mTvInputRecordingSessionImpl.startRecording((Uri) msg.obj);

                SomeArgs args = (SomeArgs) msg.obj;

                mTvInputRecordingSessionImpl.startRecording((Uri) args.arg1, (Bundle) args.arg2);

                break;

            }

            case DO_STOP_RECORDING: {
@@ -352,8 +353,9 @@ public class ITvInputSessionWrapper extends ITvInputSession.Stub implements Hand 
    }



    @Override

    public void startRecording(@Nullable Uri programUri) {

        mCaller.executeOrSendMessage(mCaller.obtainMessageO(DO_START_RECORDING, programUri));

    public void startRecording(@Nullable Uri programUri, @Nullable Bundle params) {

        mCaller.executeOrSendMessage(mCaller.obtainMessageOO(DO_START_RECORDING, programUri,

                params));

    }



    @Override

media/java/android/media/tv/TvInputManager.java

+12 −1
Original line number Diff line number Diff line
@@ -2381,12 +2381,23 @@ public final class TvInputManager { 
         *            {@link TvContract#buildProgramUri(long)}. Can be {@code null}.

         */

        void startRecording(@Nullable Uri programUri) {

            startRecording(programUri, null);

        }



        /**

         * Starts TV program recording in the current recording session.

         *

         * @param programUri The URI for the TV program to record as a hint, built by

         *            {@link TvContract#buildProgramUri(long)}. Can be {@code null}.

         * @param params A set of extra parameters which might be handled with this event.

         */

        void startRecording(@Nullable Uri programUri, @Nullable Bundle params) {

            if (mToken == null) {

                Log.w(TAG, "The session has been already released");

                return;

            }

            try {

                mService.startRecording(mToken, programUri, mUserId);

                mService.startRecording(mToken, programUri, params, mUserId);

            } catch (RemoteException e) {

                throw e.rethrowFromSystemServer();

            }