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

am: f9b3a02

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

Change-Id: I035c6e9b4a707160fd74e4f5d568c2e4bfd00713

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

@@ -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

@@ -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

@@ -352,8 +352,8 @@ public class ITvInputSessionWrapper extends ITvInputSession.Stub implements Hand
     }
 
     @Override
-    public void startRecording(@Nullable Uri programHint) {
+    public void startRecording(@Nullable Uri programUri) {
-        mCaller.executeOrSendMessage(mCaller.obtainMessageO(DO_START_RECORDING, programHint));
+        mCaller.executeOrSendMessage(mCaller.obtainMessageO(DO_START_RECORDING, programUri));
     }
 
     @Override

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

@@ -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

@@ -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
+         * A non-null {@code programUri} implies the started recording should be of that specific
-         * program, whereas null {@code programHint} does not impose such a requirement and the
+         * 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) {
+        void startRecording(@Nullable  Uri programUri) {
-            onStartRecording(programHint);
+            onStartRecording(programUri);
         }
 
         /**

media/java/android/media/tv/TvRecordingClient.java

@@ -157,7 +157,7 @@ public class TvRecordingClient {
      *
      * <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
+     * 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.

services/core/java/com/android/server/tv/TvInputManagerService.java

@@ -1557,7 +1557,7 @@ public final class TvInputManagerService extends SystemService {
         }
 
         @Override
-        public void startRecording(IBinder sessionToken, @Nullable Uri programHint, int userId) {
+        public void startRecording(IBinder sessionToken, @Nullable Uri programUri, int userId) {
             final int callingUid = Binder.getCallingUid();
             final int resolvedUserId = resolveCallingUserId(Binder.getCallingPid(), callingUid,
                     userId, "startRecording");
@@ -1566,7 +1566,7 @@ public final class TvInputManagerService extends SystemService {
                 synchronized (mLock) {
                     try {
                         getSessionLocked(sessionToken, callingUid, resolvedUserId).startRecording(
-                                programHint);
+                                programUri);
                     } catch (RemoteException | SessionNotFoundException e) {
                         Slog.e(TAG, "error in startRecording", e);
                     }