Merge "TIF: Rename connect()/disconnect() and remove unnecessary methods" into nyc-dev (e4c43065) · Commits · e / os / android_frameworks_base

api/current.txt

+9 −11

Original line number	Diff line number	Diff line
		@@ -22950,8 +22950,9 @@ package android.media.tv {
		field public static final int INPUT_STATE_DISCONNECTED = 2; // 0x2
		field public static final java.lang.String META_DATA_CONTENT_RATING_SYSTEMS = "android.media.tv.metadata.CONTENT_RATING_SYSTEMS";
		field public static final int RECORDING_ERROR_CONNECTION_FAILED = 1; // 0x1
		field public static final int RECORDING_ERROR_INSUFFICIENT_SPACE = 2; // 0x2
		field public static final int RECORDING_ERROR_RESOURCE_BUSY = 3; // 0x3
		field public static final int RECORDING_ERROR_DISCONNECTED = 2; // 0x2
		field public static final int RECORDING_ERROR_INSUFFICIENT_SPACE = 3; // 0x3
		field public static final int RECORDING_ERROR_RESOURCE_BUSY = 4; // 0x4
		field public static final int RECORDING_ERROR_UNKNOWN = 0; // 0x0
		field public static final long TIME_SHIFT_INVALID_TIME = -9223372036854775808L; // 0x8000000000000000L
		field public static final int TIME_SHIFT_STATUS_AVAILABLE = 3; // 0x3
		@@ -22994,14 +22995,13 @@ package android.media.tv {

		public static abstract class TvInputService.RecordingSession {
		ctor public TvInputService.RecordingSession(android.content.Context);
		method public void notifyConnected();
		method public void notifyError(int);
		method public void notifyRecordingStarted();
		method public void notifyRecordingStopped(android.net.Uri);
		method public abstract void onConnect(android.net.Uri);
		method public abstract void onDisconnect();
		method public void notifyTuned();
		method public abstract void onRelease();
		method public abstract void onStartRecording(android.net.Uri);
		method public abstract void onStopRecording();
		method public abstract void onTune(android.net.Uri);
		}

		public static abstract class TvInputService.Session implements android.view.KeyEvent.Callback {
		@@ -23044,19 +23044,17 @@ package android.media.tv {

		public class TvRecordingClient {
		ctor public TvRecordingClient(android.content.Context, java.lang.String, android.media.tv.TvRecordingClient.RecordingCallback, android.os.Handler);
		method public void connect(java.lang.String, android.net.Uri);
		method public void disconnect();
		method public void release();
		method public void startRecording(android.net.Uri);
		method public void stopRecording();
		method public void tune(java.lang.String, android.net.Uri);
		}

		public static abstract class TvRecordingClient.RecordingCallback {
		ctor public TvRecordingClient.RecordingCallback();
		method public void onConnected();
		method public void onDisconnected();
		method public void onError(int);
		method public void onRecordingStarted();
		method public void onRecordingStopped(android.net.Uri);
		method public void onTuned();
		}

		public final class TvTrackInfo implements android.os.Parcelable {

api/system-current.txt

+11 −13

Original line number	Diff line number	Diff line
		@@ -24649,8 +24649,9 @@ package android.media.tv {
		field public static final int INPUT_STATE_DISCONNECTED = 2; // 0x2
		field public static final java.lang.String META_DATA_CONTENT_RATING_SYSTEMS = "android.media.tv.metadata.CONTENT_RATING_SYSTEMS";
		field public static final int RECORDING_ERROR_CONNECTION_FAILED = 1; // 0x1
		field public static final int RECORDING_ERROR_INSUFFICIENT_SPACE = 2; // 0x2
		field public static final int RECORDING_ERROR_RESOURCE_BUSY = 3; // 0x3
		field public static final int RECORDING_ERROR_DISCONNECTED = 2; // 0x2
		field public static final int RECORDING_ERROR_INSUFFICIENT_SPACE = 3; // 0x3
		field public static final int RECORDING_ERROR_RESOURCE_BUSY = 4; // 0x4
		field public static final int RECORDING_ERROR_UNKNOWN = 0; // 0x0
		field public static final long TIME_SHIFT_INVALID_TIME = -9223372036854775808L; // 0x8000000000000000L
		field public static final int TIME_SHIFT_STATUS_AVAILABLE = 3; // 0x3
		@@ -24743,17 +24744,16 @@ package android.media.tv {

		public static abstract class TvInputService.RecordingSession {
		ctor public TvInputService.RecordingSession(android.content.Context);
		method public void notifyConnected();
		method public void notifyError(int);
		method public void notifyRecordingStarted();
		method public void notifyRecordingStopped(android.net.Uri);
		method public void notifySessionEvent(java.lang.String, android.os.Bundle);
		method public void notifyTuned();
		method public void onAppPrivateCommand(java.lang.String, android.os.Bundle);
		method public abstract void onConnect(android.net.Uri);
		method public void onConnect(android.net.Uri, android.os.Bundle);
		method public abstract void onDisconnect();
		method public abstract void onRelease();
		method public abstract void onStartRecording(android.net.Uri);
		method public abstract void onStopRecording();
		method public abstract void onTune(android.net.Uri);
		method public void onTune(android.net.Uri, android.os.Bundle);
		}

		public static abstract class TvInputService.Session implements android.view.KeyEvent.Callback {
		@@ -24800,22 +24800,20 @@ package android.media.tv {

		public class TvRecordingClient {
		ctor public TvRecordingClient(android.content.Context, java.lang.String, android.media.tv.TvRecordingClient.RecordingCallback, android.os.Handler);
		method public void connect(java.lang.String, android.net.Uri);
		method public void connect(java.lang.String, android.net.Uri, android.os.Bundle);
		method public void disconnect();
		method public void release();
		method public void sendAppPrivateCommand(java.lang.String, android.os.Bundle);
		method public void startRecording(android.net.Uri);
		method public void stopRecording();
		method public void tune(java.lang.String, android.net.Uri);
		method public void tune(java.lang.String, android.net.Uri, android.os.Bundle);
		}

		public static abstract class TvRecordingClient.RecordingCallback {
		ctor public TvRecordingClient.RecordingCallback();
		method public void onConnected();
		method public void onDisconnected();
		method public void onError(int);
		method public void onEvent(java.lang.String, java.lang.String, android.os.Bundle);
		method public void onRecordingStarted();
		method public void onRecordingStopped(android.net.Uri);
		method public void onTuned();
		}

		public class TvStreamConfig implements android.os.Parcelable {

api/test-current.txt

+9 −11

Original line number	Diff line number	Diff line
		@@ -22959,8 +22959,9 @@ package android.media.tv {
		field public static final int INPUT_STATE_DISCONNECTED = 2; // 0x2
		field public static final java.lang.String META_DATA_CONTENT_RATING_SYSTEMS = "android.media.tv.metadata.CONTENT_RATING_SYSTEMS";
		field public static final int RECORDING_ERROR_CONNECTION_FAILED = 1; // 0x1
		field public static final int RECORDING_ERROR_INSUFFICIENT_SPACE = 2; // 0x2
		field public static final int RECORDING_ERROR_RESOURCE_BUSY = 3; // 0x3
		field public static final int RECORDING_ERROR_DISCONNECTED = 2; // 0x2
		field public static final int RECORDING_ERROR_INSUFFICIENT_SPACE = 3; // 0x3
		field public static final int RECORDING_ERROR_RESOURCE_BUSY = 4; // 0x4
		field public static final int RECORDING_ERROR_UNKNOWN = 0; // 0x0
		field public static final long TIME_SHIFT_INVALID_TIME = -9223372036854775808L; // 0x8000000000000000L
		field public static final int TIME_SHIFT_STATUS_AVAILABLE = 3; // 0x3
		@@ -23003,14 +23004,13 @@ package android.media.tv {

		public static abstract class TvInputService.RecordingSession {
		ctor public TvInputService.RecordingSession(android.content.Context);
		method public void notifyConnected();
		method public void notifyError(int);
		method public void notifyRecordingStarted();
		method public void notifyRecordingStopped(android.net.Uri);
		method public abstract void onConnect(android.net.Uri);
		method public abstract void onDisconnect();
		method public void notifyTuned();
		method public abstract void onRelease();
		method public abstract void onStartRecording(android.net.Uri);
		method public abstract void onStopRecording();
		method public abstract void onTune(android.net.Uri);
		}

		public static abstract class TvInputService.Session implements android.view.KeyEvent.Callback {
		@@ -23053,19 +23053,17 @@ package android.media.tv {

		public class TvRecordingClient {
		ctor public TvRecordingClient(android.content.Context, java.lang.String, android.media.tv.TvRecordingClient.RecordingCallback, android.os.Handler);
		method public void connect(java.lang.String, android.net.Uri);
		method public void disconnect();
		method public void release();
		method public void startRecording(android.net.Uri);
		method public void stopRecording();
		method public void tune(java.lang.String, android.net.Uri);
		}

		public static abstract class TvRecordingClient.RecordingCallback {
		ctor public TvRecordingClient.RecordingCallback();
		method public void onConnected();
		method public void onDisconnected();
		method public void onError(int);
		method public void onRecordingStarted();
		method public void onRecordingStopped(android.net.Uri);
		method public void onTuned();
		}

		public final class TvTrackInfo implements android.os.Parcelable {

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -45,8 +45,7 @@ oneway interface ITvInputClient {
		void onTimeShiftCurrentPositionChanged(long timeMs, int seq);

		// For the recording session
		void onConnected(int seq);
		void onRecordingStarted(int seq);
		void onTuned(int seq);
		void onRecordingStopped(in Uri recordedProgramUri, int seq);
		void onError(int error, int seq);
		}

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

+0 −1

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

		// For the recording session
		void connect(in IBinder sessionToken, in Uri channelUri, in Bundle params, int userId);
		void startRecording(in IBinder sessionToken, in Uri programHint, int userId);
		void stopRecording(in IBinder sessionToken, int userId);