Merge "TIF: Redefine time shift status and change callback and position APIs" (9054431a) · Commits · e / os / android_frameworks_base

api/current.txt

+6 −6

Original line number	Diff line number	Diff line
		@@ -17519,9 +17519,10 @@ 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 long TIME_SHIFT_INVALID_TIME = -9223372036854775808L; // 0x8000000000000000L
		field public static final int TIME_SHIFT_STATUS_AVAILABLE = 0; // 0x0
		field public static final int TIME_SHIFT_STATUS_ERROR = 2; // 0x2
		field public static final int TIME_SHIFT_STATUS_UNAVAILABLE = 1; // 0x1
		field public static final int TIME_SHIFT_STATUS_AVAILABLE = 3; // 0x3
		field public static final int TIME_SHIFT_STATUS_UNAVAILABLE = 2; // 0x2
		field public static final int TIME_SHIFT_STATUS_UNKNOWN = 0; // 0x0
		field public static final int TIME_SHIFT_STATUS_UNSUPPORTED = 1; // 0x1
		field public static final int VIDEO_UNAVAILABLE_REASON_BUFFERING = 3; // 0x3
		field public static final int VIDEO_UNAVAILABLE_REASON_TUNING = 1; // 0x1
		field public static final int VIDEO_UNAVAILABLE_REASON_UNKNOWN = 0; // 0x0
		@@ -17556,7 +17557,6 @@ package android.media.tv {
		method public void notifyChannelRetuned(android.net.Uri);
		method public void notifyContentAllowed();
		method public void notifyContentBlocked(android.media.tv.TvContentRating);
		method public void notifyTimeShiftStartPositionChanged(long);
		method public void notifyTimeShiftStatusChanged(int);
		method public void notifyTrackSelected(int, java.lang.String);
		method public void notifyTracksChanged(java.util.List<android.media.tv.TvTrackInfo>);
		@@ -17575,6 +17575,7 @@ package android.media.tv {
		method public abstract boolean onSetSurface(android.view.Surface);
		method public void onSurfaceChanged(int, int, int);
		method public long onTimeShiftGetCurrentPosition();
		method public long onTimeShiftGetStartPosition();
		method public void onTimeShiftPause();
		method public void onTimeShiftResume();
		method public void onTimeShiftSeekTo(long);
		@@ -17627,19 +17628,18 @@ package android.media.tv {
		method public java.util.List<android.media.tv.TvTrackInfo> getTracks(int);
		method protected void onLayout(boolean, int, int, int, int);
		method public boolean onUnhandledInputEvent(android.view.InputEvent);
		method public void registerTimeShiftPositionCallback(android.media.tv.TvView.TimeShiftPositionCallback);
		method public void reset();
		method public void selectTrack(int, java.lang.String);
		method public void setCallback(android.media.tv.TvView.TvInputCallback);
		method public void setCaptionEnabled(boolean);
		method public void setOnUnhandledInputEventListener(android.media.tv.TvView.OnUnhandledInputEventListener);
		method public void setStreamVolume(float);
		method public void setTimeShiftPositionCallback(android.media.tv.TvView.TimeShiftPositionCallback);
		method public void timeShiftPause();
		method public void timeShiftResume();
		method public void timeShiftSeekTo(long);
		method public void timeShiftSetPlaybackRate(float, int);
		method public void tune(java.lang.String, android.net.Uri);
		method public void unregisterTimeShiftPositionCallback(android.media.tv.TvView.TimeShiftPositionCallback);
		}

		public static abstract interface TvView.OnUnhandledInputEventListener {

api/system-current.txt

+6 −6

Original line number	Diff line number	Diff line
		@@ -18882,9 +18882,10 @@ 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 long TIME_SHIFT_INVALID_TIME = -9223372036854775808L; // 0x8000000000000000L
		field public static final int TIME_SHIFT_STATUS_AVAILABLE = 0; // 0x0
		field public static final int TIME_SHIFT_STATUS_ERROR = 2; // 0x2
		field public static final int TIME_SHIFT_STATUS_UNAVAILABLE = 1; // 0x1
		field public static final int TIME_SHIFT_STATUS_AVAILABLE = 3; // 0x3
		field public static final int TIME_SHIFT_STATUS_UNAVAILABLE = 2; // 0x2
		field public static final int TIME_SHIFT_STATUS_UNKNOWN = 0; // 0x0
		field public static final int TIME_SHIFT_STATUS_UNSUPPORTED = 1; // 0x1
		field public static final int VIDEO_UNAVAILABLE_REASON_BUFFERING = 3; // 0x3
		field public static final int VIDEO_UNAVAILABLE_REASON_TUNING = 1; // 0x1
		field public static final int VIDEO_UNAVAILABLE_REASON_UNKNOWN = 0; // 0x0
		@@ -18972,7 +18973,6 @@ package android.media.tv {
		method public void notifyContentAllowed();
		method public void notifyContentBlocked(android.media.tv.TvContentRating);
		method public void notifySessionEvent(java.lang.String, android.os.Bundle);
		method public void notifyTimeShiftStartPositionChanged(long);
		method public void notifyTimeShiftStatusChanged(int);
		method public void notifyTrackSelected(int, java.lang.String);
		method public void notifyTracksChanged(java.util.List<android.media.tv.TvTrackInfo>);
		@@ -18994,6 +18994,7 @@ package android.media.tv {
		method public abstract boolean onSetSurface(android.view.Surface);
		method public void onSurfaceChanged(int, int, int);
		method public long onTimeShiftGetCurrentPosition();
		method public long onTimeShiftGetStartPosition();
		method public void onTimeShiftPause();
		method public void onTimeShiftResume();
		method public void onTimeShiftSeekTo(long);
		@@ -19070,7 +19071,6 @@ package android.media.tv {
		method public java.util.List<android.media.tv.TvTrackInfo> getTracks(int);
		method protected void onLayout(boolean, int, int, int, int);
		method public boolean onUnhandledInputEvent(android.view.InputEvent);
		method public void registerTimeShiftPositionCallback(android.media.tv.TvView.TimeShiftPositionCallback);
		method public void requestUnblockContent(android.media.tv.TvContentRating);
		method public void reset();
		method public void selectTrack(int, java.lang.String);
		@@ -19080,6 +19080,7 @@ package android.media.tv {
		method public void setMain();
		method public void setOnUnhandledInputEventListener(android.media.tv.TvView.OnUnhandledInputEventListener);
		method public void setStreamVolume(float);
		method public void setTimeShiftPositionCallback(android.media.tv.TvView.TimeShiftPositionCallback);
		method public void setZOrderMediaOverlay(boolean);
		method public void setZOrderOnTop(boolean);
		method public void timeShiftPause();
		@@ -19088,7 +19089,6 @@ package android.media.tv {
		method public void timeShiftSetPlaybackRate(float, int);
		method public void tune(java.lang.String, android.net.Uri);
		method public void tune(java.lang.String, android.net.Uri, android.os.Bundle);
		method public void unregisterTimeShiftPositionCallback(android.media.tv.TvView.TimeShiftPositionCallback);
		}

		public static abstract interface TvView.OnUnhandledInputEventListener {

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -78,7 +78,7 @@ interface ITvInputManager {
		void timeShiftResume(in IBinder sessionToken, int userId);
		void timeShiftSeekTo(in IBinder sessionToken, long timeMs, int userId);
		void timeShiftSetPlaybackRate(in IBinder sessionToken, float rate, int audioMode, int userId);
		void timeShiftTrackCurrentPosition(in IBinder sessionToken, boolean enabled, int userId);
		void timeShiftEnablePositionTracking(in IBinder sessionToken, boolean enable, int userId);

		// For TV input hardware binding
		List<TvInputHardwareInfo> getHardwareList();

media/java/android/media/tv/ITvInputSession.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -51,5 +51,5 @@ oneway interface ITvInputSession {
		void timeShiftResume();
		void timeShiftSeekTo(long timeMs);
		void timeShiftSetPlaybackRate(float rate, int audioMode);
		void timeShiftTrackCurrentPosition(boolean enabled);
		void timeShiftEnablePositionTracking(boolean enable);
		}

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

+6 −6

Original line number	Diff line number	Diff line
		@@ -61,7 +61,7 @@ public class ITvInputSessionWrapper extends ITvInputSession.Stub implements Hand
		private static final int DO_TIME_SHIFT_RESUME = 15;
		private static final int DO_TIME_SHIFT_SEEK_TO = 16;
		private static final int DO_TIME_SHIFT_SET_PLAYBACK_RATE = 17;
		private static final int DO_TIME_SHIFT_TRACK_CURRENT_POSITION = 18;
		private static final int DO_TIME_SHIFT_ENABLE_POSITION_TRACKING = 18;

		private final HandlerCaller mCaller;

		@@ -174,8 +174,8 @@ public class ITvInputSessionWrapper extends ITvInputSession.Stub implements Hand
		mTvInputSessionImpl.timeShiftSetPlaybackRate((Float) msg.obj, msg.arg1);
		break;
		}
		case DO_TIME_SHIFT_TRACK_CURRENT_POSITION: {
		mTvInputSessionImpl.timeShiftTrackCurrentPosition((Boolean) msg.obj);
		case DO_TIME_SHIFT_ENABLE_POSITION_TRACKING: {
		mTvInputSessionImpl.timeShiftEnablePositionTracking((Boolean) msg.obj);
		break;
		}
		default: {
		@@ -290,9 +290,9 @@ public class ITvInputSessionWrapper extends ITvInputSession.Stub implements Hand
		}

		@Override
		public void timeShiftTrackCurrentPosition(boolean enabled) {
		mCaller.executeOrSendMessage(mCaller.obtainMessageO(DO_TIME_SHIFT_TRACK_CURRENT_POSITION,
		Boolean.valueOf(enabled)));
		public void timeShiftEnablePositionTracking(boolean enable) {
		mCaller.executeOrSendMessage(mCaller.obtainMessageO(
		DO_TIME_SHIFT_ENABLE_POSITION_TRACKING, Boolean.valueOf(enable)));
		}

		private final class TvInputEventReceiver extends InputEventReceiver {