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

Commit 53fc5d3d authored by Dongwon Kang's avatar Dongwon Kang Committed by android-build-merger
Browse files

Merge "TIF: Be consistent with argument name for startRecording" into nyc-dev 

am: 0751a83a

* commit '0751a83a':
  TIF: Be consistent with argument name for startRecording

Change-Id: I0701d1e106c57f310e30c65bc178c5b6b4e7344a
parents 59ad4046 0751a83a

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

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



    // For the recording session

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

    void startRecording(in IBinder sessionToken, in Uri programUri, 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 programHint);

    void startRecording(in Uri programUri);

    void stopRecording();

}

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

+2 −2
Original line number Diff line number Diff line
@@ -352,8 +352,8 @@ public class ITvInputSessionWrapper extends ITvInputSession.Stub implements Hand 
    }



    @Override

    public void startRecording(@Nullable Uri programHint) {

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

    public void startRecording(@Nullable Uri programUri) {

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

    }



    @Override

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

+3 −3
Original line number Diff line number Diff line
@@ -2093,16 +2093,16 @@ public final class TvInputManager { 
        /**

         * Starts TV program recording in the current recording session.

         *

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

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

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

         */

        void startRecording(@Nullable Uri programHint) {

        void startRecording(@Nullable Uri programUri) {

            if (mToken == null) {

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

                return;

            }

            try {

                mService.startRecording(mToken, programHint, mUserId);

                mService.startRecording(mToken, programUri, mUserId);

            } catch (RemoteException e) {

                throw e.rethrowFromSystemServer();

            }

media/java/android/media/tv/TvInputService.java

+4 −4
Original line number Diff line number Diff line
@@ -1695,8 +1695,8 @@ public abstract class TvInputService extends Service { 
         *

         * <p>The application may supply the URI for a TV program for filling in program specific

         * data fields in the {@link android.media.tv.TvContract.RecordedPrograms} table.

         * A non-null {@code programHint} implies the started recording should be of that specific

         * program, whereas null {@code programHint} does not impose such a requirement and the

         * A non-null {@code programUri} implies the started recording should be of that specific

         * program, whereas null {@code programUri} does not impose such a requirement and the

         * recording can span across multiple TV programs. In either case, the application must call

         * {@link TvRecordingClient#stopRecording()} to stop the recording.

         *
@@ -1761,8 +1761,8 @@ public abstract class TvInputService extends Service { 
         * Calls {@link #onStartRecording(Uri)}.

         *

         */

        void startRecording(@Nullable  Uri programHint) {

            onStartRecording(programHint);

        void startRecording(@Nullable  Uri programUri) {

            onStartRecording(programUri);

        }



        /**