Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: f9b3a02

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

Change-Id: I035c6e9b4a707160fd74e4f5d568c2e4bfd00713
This commit is contained in:
Dongwon Kang
2016-04-25 22:53:13 +00:00
committed by android-build-merger
parent f6784cd0dd f9b3a021c3
commit 39045d4321
7 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media/java/android/media/tv/ITvInputManager.aidl
View File

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

2
media/java/android/media/tv/ITvInputSession.aidl
View File

@@ -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();
}

4
media/java/android/media/tv/ITvInputSessionWrapper.java
View File

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

6
media/java/android/media/tv/TvInputManager.java
View File

@@ -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();
}

8
media/java/android/media/tv/TvInputService.java
View File

@@ -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);
}
/**

2
media/java/android/media/tv/TvRecordingClient.java
View File

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

4
services/core/java/com/android/server/tv/TvInputManagerService.java
View File

@@ -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);
}