Merge "TIF: Recording API" (9df90a5a) · Commits · e / os / android_frameworks_base

api/current.txt

+75 −0

Original line number	Diff line number	Diff line
		@@ -22216,6 +22216,7 @@ package android.media.tv {
		method public static final android.net.Uri buildProgramsUriForChannel(android.net.Uri);
		method public static final android.net.Uri buildProgramsUriForChannel(long, long, long);
		method public static final android.net.Uri buildProgramsUriForChannel(android.net.Uri, long, long);
		method public static final android.net.Uri buildRecordedProgramUri(long);
		field public static final java.lang.String AUTHORITY = "android.media.tv";
		}

		@@ -22352,13 +22353,49 @@ package android.media.tv {
		field public static final java.lang.String TRAVEL = "TRAVEL";
		}

		public static final class TvContract.RecordedPrograms implements android.media.tv.TvContract.BaseTvColumns {
		field public static final java.lang.String COLUMN_AUDIO_LANGUAGE = "audio_language";
		field public static final java.lang.String COLUMN_BROADCAST_GENRE = "broadcast_genre";
		field public static final java.lang.String COLUMN_CANONICAL_GENRE = "canonical_genre";
		field public static final java.lang.String COLUMN_CHANNEL_ID = "channel_id";
		field public static final java.lang.String COLUMN_CONTENT_RATING = "content_rating";
		field public static final java.lang.String COLUMN_END_TIME_UTC_MILLIS = "end_time_utc_millis";
		field public static final java.lang.String COLUMN_EPISODE_NUMBER = "episode_number";
		field public static final java.lang.String COLUMN_EPISODE_TITLE = "episode_title";
		field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_DATA = "internal_provider_data";
		field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG1 = "internal_provider_flag1";
		field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG2 = "internal_provider_flag2";
		field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG3 = "internal_provider_flag3";
		field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG4 = "internal_provider_flag4";
		field public static final java.lang.String COLUMN_LONG_DESCRIPTION = "long_description";
		field public static final java.lang.String COLUMN_POSTER_ART_URI = "poster_art_uri";
		field public static final java.lang.String COLUMN_RECORDING_DATA_BYTES = "recording_data_bytes";
		field public static final java.lang.String COLUMN_RECORDING_DATA_URI = "recording_data_uri";
		field public static final java.lang.String COLUMN_RECORDING_DURATION_MILLIS = "recording_duration_millis";
		field public static final java.lang.String COLUMN_RECORDING_EXPIRE_TIME_UTC_MILLIS = "recording_expire_time_utc_millis";
		field public static final java.lang.String COLUMN_SEARCHABLE = "searchable";
		field public static final java.lang.String COLUMN_SEASON_NUMBER = "season_number";
		field public static final java.lang.String COLUMN_SHORT_DESCRIPTION = "short_description";
		field public static final java.lang.String COLUMN_START_TIME_UTC_MILLIS = "start_time_utc_millis";
		field public static final java.lang.String COLUMN_THUMBNAIL_URI = "thumbnail_uri";
		field public static final java.lang.String COLUMN_TITLE = "title";
		field public static final java.lang.String COLUMN_VERSION_NUMBER = "version_number";
		field public static final java.lang.String COLUMN_VIDEO_HEIGHT = "video_height";
		field public static final java.lang.String COLUMN_VIDEO_WIDTH = "video_width";
		field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/recorded_program";
		field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/recorded_program";
		field public static final android.net.Uri CONTENT_URI;
		}

		public final class TvInputInfo implements android.os.Parcelable {
		method public boolean canRecord();
		method public android.content.Intent createSettingsIntent();
		method public android.content.Intent createSetupIntent();
		method public int describeContents();
		method public java.lang.String getId();
		method public java.lang.String getParentId();
		method public android.content.pm.ServiceInfo getServiceInfo();
		method public int getTunerCount();
		method public int getType();
		method public boolean isPassthroughInput();
		method public android.graphics.drawable.Drawable loadIcon(android.content.Context);
		@@ -22393,6 +22430,10 @@ package android.media.tv {
		field public static final int INPUT_STATE_CONNECTED_STANDBY = 1; // 0x1
		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_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
		field public static final int TIME_SHIFT_STATUS_UNAVAILABLE = 2; // 0x2
		@@ -22410,12 +22451,15 @@ package android.media.tv {
		method public void onInputAdded(java.lang.String);
		method public void onInputRemoved(java.lang.String);
		method public void onInputStateChanged(java.lang.String, int);
		method public void onTvInputInfoChanged(java.lang.String, android.media.tv.TvInputInfo);
		}

		public abstract class TvInputService extends android.app.Service {
		ctor public TvInputService();
		method public final android.os.IBinder onBind(android.content.Intent);
		method public abstract android.media.tv.TvInputService.RecordingSession onCreateRecordingSession(java.lang.String);
		method public abstract android.media.tv.TvInputService.Session onCreateSession(java.lang.String);
		method public final void setTvInputInfo(java.lang.String, android.media.tv.TvInputInfo);
		field public static final java.lang.String SERVICE_INTERFACE = "android.media.tv.TvInputService";
		field public static final java.lang.String SERVICE_META_DATA = "android.media.tv.input";
		}
		@@ -22428,6 +22472,18 @@ package android.media.tv {
		method public final boolean onSetSurface(android.view.Surface);
		}

		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 abstract void onStartRecording();
		method public abstract void onStopRecording();
		}

		public static abstract class TvInputService.Session implements android.view.KeyEvent.Callback {
		ctor public TvInputService.Session(android.content.Context);
		method public void layoutSurface(int, int, int, int);
		@@ -22455,6 +22511,7 @@ package android.media.tv {
		method public long onTimeShiftGetCurrentPosition();
		method public long onTimeShiftGetStartPosition();
		method public void onTimeShiftPause();
		method public void onTimeShiftPlay(android.net.Uri);
		method public void onTimeShiftResume();
		method public void onTimeShiftSeekTo(long);
		method public void onTimeShiftSetPlaybackParams(android.media.PlaybackParams);
		@@ -22465,6 +22522,23 @@ package android.media.tv {
		method public void setOverlayViewEnabled(boolean);
		}

		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 startRecording();
		method public void stopRecording();
		}

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

		public final class TvTrackInfo implements android.os.Parcelable {
		method public int describeContents();
		method public final int getAudioChannelCount();
		@@ -22516,6 +22590,7 @@ package android.media.tv {
		method public void setStreamVolume(float);
		method public void setTimeShiftPositionCallback(android.media.tv.TvView.TimeShiftPositionCallback);
		method public void timeShiftPause();
		method public void timeShiftPlay(java.lang.String, android.net.Uri);
		method public void timeShiftResume();
		method public void timeShiftSeekTo(long);
		method public void timeShiftSetPlaybackParams(android.media.PlaybackParams);

api/system-current.txt

+82 −0

Original line number	Diff line number	Diff line
		@@ -23643,6 +23643,7 @@ package android.media.tv {
		method public static final android.net.Uri buildProgramsUriForChannel(android.net.Uri);
		method public static final android.net.Uri buildProgramsUriForChannel(long, long, long);
		method public static final android.net.Uri buildProgramsUriForChannel(android.net.Uri, long, long);
		method public static final android.net.Uri buildRecordedProgramUri(long);
		method public static final boolean isChannelUriForPassthroughInput(android.net.Uri);
		field public static final java.lang.String AUTHORITY = "android.media.tv";
		}
		@@ -23783,6 +23784,40 @@ package android.media.tv {
		field public static final java.lang.String TRAVEL = "TRAVEL";
		}

		public static final class TvContract.RecordedPrograms implements android.media.tv.TvContract.BaseTvColumns {
		field public static final java.lang.String COLUMN_AUDIO_LANGUAGE = "audio_language";
		field public static final java.lang.String COLUMN_BROADCAST_GENRE = "broadcast_genre";
		field public static final java.lang.String COLUMN_CANONICAL_GENRE = "canonical_genre";
		field public static final java.lang.String COLUMN_CHANNEL_ID = "channel_id";
		field public static final java.lang.String COLUMN_CONTENT_RATING = "content_rating";
		field public static final java.lang.String COLUMN_END_TIME_UTC_MILLIS = "end_time_utc_millis";
		field public static final java.lang.String COLUMN_EPISODE_NUMBER = "episode_number";
		field public static final java.lang.String COLUMN_EPISODE_TITLE = "episode_title";
		field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_DATA = "internal_provider_data";
		field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG1 = "internal_provider_flag1";
		field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG2 = "internal_provider_flag2";
		field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG3 = "internal_provider_flag3";
		field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG4 = "internal_provider_flag4";
		field public static final java.lang.String COLUMN_LONG_DESCRIPTION = "long_description";
		field public static final java.lang.String COLUMN_POSTER_ART_URI = "poster_art_uri";
		field public static final java.lang.String COLUMN_RECORDING_DATA_BYTES = "recording_data_bytes";
		field public static final java.lang.String COLUMN_RECORDING_DATA_URI = "recording_data_uri";
		field public static final java.lang.String COLUMN_RECORDING_DURATION_MILLIS = "recording_duration_millis";
		field public static final java.lang.String COLUMN_RECORDING_EXPIRE_TIME_UTC_MILLIS = "recording_expire_time_utc_millis";
		field public static final java.lang.String COLUMN_SEARCHABLE = "searchable";
		field public static final java.lang.String COLUMN_SEASON_NUMBER = "season_number";
		field public static final java.lang.String COLUMN_SHORT_DESCRIPTION = "short_description";
		field public static final java.lang.String COLUMN_START_TIME_UTC_MILLIS = "start_time_utc_millis";
		field public static final java.lang.String COLUMN_THUMBNAIL_URI = "thumbnail_uri";
		field public static final java.lang.String COLUMN_TITLE = "title";
		field public static final java.lang.String COLUMN_VERSION_NUMBER = "version_number";
		field public static final java.lang.String COLUMN_VIDEO_HEIGHT = "video_height";
		field public static final java.lang.String COLUMN_VIDEO_WIDTH = "video_width";
		field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/recorded_program";
		field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/recorded_program";
		field public static final android.net.Uri CONTENT_URI;
		}

		public static final class TvContract.WatchedPrograms implements android.media.tv.TvContract.BaseTvColumns {
		field public static final java.lang.String COLUMN_CHANNEL_ID = "channel_id";
		field public static final java.lang.String COLUMN_DESCRIPTION = "description";
		@@ -23831,6 +23866,7 @@ package android.media.tv {
		}

		public final class TvInputInfo implements android.os.Parcelable {
		method public boolean canRecord();
		method public android.content.Intent createSettingsIntent();
		method public android.content.Intent createSetupIntent();
		method public static android.media.tv.TvInputInfo createTvInputInfo(android.content.Context, android.content.pm.ResolveInfo, android.hardware.hdmi.HdmiDeviceInfo, java.lang.String, java.lang.String, android.net.Uri) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
		@@ -23842,6 +23878,7 @@ package android.media.tv {
		method public java.lang.String getId();
		method public java.lang.String getParentId();
		method public android.content.pm.ServiceInfo getServiceInfo();
		method public int getTunerCount();
		method public int getType();
		method public boolean isConnectedToHdmiSwitch();
		method public boolean isHardwareInput();
		@@ -23876,6 +23913,7 @@ package android.media.tv {
		method public android.media.tv.TvInputManager.Hardware acquireTvInputHardware(int, android.media.tv.TvInputManager.HardwareCallback, android.media.tv.TvInputInfo);
		method public void addBlockedRating(android.media.tv.TvContentRating);
		method public boolean captureFrame(java.lang.String, android.view.Surface, android.media.tv.TvStreamConfig);
		method public void createRecordingSession(java.lang.String, android.media.tv.TvInputManager.SessionCallback, android.os.Handler);
		method public void createSession(java.lang.String, android.media.tv.TvInputManager.SessionCallback, android.os.Handler);
		method public java.util.List<android.media.tv.TvStreamConfig> getAvailableTvStreamConfigList(java.lang.String);
		method public java.util.List<android.media.tv.TvContentRating> getBlockedRatings();
		@@ -23899,6 +23937,10 @@ package android.media.tv {
		field public static final int INPUT_STATE_CONNECTED_STANDBY = 1; // 0x1
		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_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
		field public static final int TIME_SHIFT_STATUS_UNAVAILABLE = 2; // 0x2
		@@ -23963,16 +24005,19 @@ package android.media.tv {
		method public void onInputRemoved(java.lang.String);
		method public void onInputStateChanged(java.lang.String, int);
		method public void onInputUpdated(java.lang.String);
		method public void onTvInputInfoChanged(java.lang.String, android.media.tv.TvInputInfo);
		}

		public abstract class TvInputService extends android.app.Service {
		ctor public TvInputService();
		method public final android.os.IBinder onBind(android.content.Intent);
		method public abstract android.media.tv.TvInputService.RecordingSession onCreateRecordingSession(java.lang.String);
		method public abstract android.media.tv.TvInputService.Session onCreateSession(java.lang.String);
		method public android.media.tv.TvInputInfo onHardwareAdded(android.media.tv.TvInputHardwareInfo);
		method public java.lang.String onHardwareRemoved(android.media.tv.TvInputHardwareInfo);
		method public android.media.tv.TvInputInfo onHdmiDeviceAdded(android.hardware.hdmi.HdmiDeviceInfo);
		method public java.lang.String onHdmiDeviceRemoved(android.hardware.hdmi.HdmiDeviceInfo);
		method public final void setTvInputInfo(java.lang.String, android.media.tv.TvInputInfo);
		field public static final java.lang.String SERVICE_INTERFACE = "android.media.tv.TvInputService";
		field public static final java.lang.String SERVICE_META_DATA = "android.media.tv.input";
		}
		@@ -23985,6 +24030,21 @@ package android.media.tv {
		method public final boolean onSetSurface(android.view.Surface);
		}

		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 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 onStartRecording();
		method public abstract void onStopRecording();
		}

		public static abstract class TvInputService.Session implements android.view.KeyEvent.Callback {
		ctor public TvInputService.Session(android.content.Context);
		method public void layoutSurface(int, int, int, int);
		@@ -24015,6 +24075,7 @@ package android.media.tv {
		method public long onTimeShiftGetCurrentPosition();
		method public long onTimeShiftGetStartPosition();
		method public void onTimeShiftPause();
		method public void onTimeShiftPlay(android.net.Uri);
		method public void onTimeShiftResume();
		method public void onTimeShiftSeekTo(long);
		method public void onTimeShiftSetPlaybackParams(android.media.PlaybackParams);
		@@ -24026,6 +24087,26 @@ package android.media.tv {
		method public void setOverlayViewEnabled(boolean);
		}

		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 sendAppPrivateCommand(java.lang.String, android.os.Bundle);
		method public void startRecording();
		method public void stopRecording();
		}

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

		public class TvStreamConfig implements android.os.Parcelable {
		method public int describeContents();
		method public int getFlags();
		@@ -24108,6 +24189,7 @@ package android.media.tv {
		method public void setZOrderMediaOverlay(boolean);
		method public void setZOrderOnTop(boolean);
		method public void timeShiftPause();
		method public void timeShiftPlay(java.lang.String, android.net.Uri);
		method public void timeShiftResume();
		method public void timeShiftSeekTo(long);
		method public void timeShiftSetPlaybackParams(android.media.PlaybackParams);

api/test-current.txt

+75 −0

File changed.

Preview size limit exceeded, changes collapsed.

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -43,4 +43,10 @@ oneway interface ITvInputClient {
		void onTimeShiftStatusChanged(int status, int seq);
		void onTimeShiftStartPositionChanged(long timeMs, int seq);
		void onTimeShiftCurrentPositionChanged(long timeMs, int seq);

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

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

+8 −1

Original line number	Diff line number	Diff line
		@@ -55,7 +55,8 @@ interface ITvInputManager {
		void addBlockedRating(in String rating, int userId);
		void removeBlockedRating(in String rating, int userId);

		void createSession(in ITvInputClient client, in String inputId, int seq, int userId);
		void createSession(in ITvInputClient client, in String inputId, boolean isRecordingSession,
		int seq, int userId);
		void releaseSession(in IBinder sessionToken, int userId);

		void setMainSession(in IBinder sessionToken, int userId);
		@@ -77,12 +78,18 @@ interface ITvInputManager {

		void unblockContent(in IBinder sessionToken, in String unblockedRating, int userId);

		void timeShiftPlay(in IBinder sessionToken, in Uri recordedProgramUri, int userId);
		void timeShiftPause(in IBinder sessionToken, int userId);
		void timeShiftResume(in IBinder sessionToken, int userId);
		void timeShiftSeekTo(in IBinder sessionToken, long timeMs, int userId);
		void timeShiftSetPlaybackParams(in IBinder sessionToken, in PlaybackParams params, int userId);
		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, int userId);
		void stopRecording(in IBinder sessionToken, int userId);

		// For TV input hardware binding
		List<TvInputHardwareInfo> getHardwareList();
		ITvInputHardware acquireTvInputHardware(int deviceId, in ITvInputHardwareCallback callback,