Merge "TIF: Use @SystemApi for APIs that we intend to open to OEMs" into lmp-dev (9adf3dfe) · Commits · e / os / android_frameworks_base

media/java/android/media/tv/TvContract.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1109,6 +1109,7 @@ public final class TvContract {
	* @return {@code true} if the genre is canonical, otherwise {@code false}.		* @return {@code true} if the genre is canonical, otherwise {@code false}.
	* @hide		* @hide
	*/		*/
			@SystemApi
	public static boolean isCanonical(String genre) {		public static boolean isCanonical(String genre) {
	return CANONICAL_GENRES.contains(genre);		return CANONICAL_GENRES.contains(genre);
	}		}

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

+5 −2

Original line number	Original line	Diff line number	Diff line
	@@ -126,6 +126,7 @@ public final class TvInputManager {
	* Interface used to receive the created session.		* Interface used to receive the created session.
	* @hide		* @hide
	*/		*/
			@SystemApi
	public abstract static class SessionCallback {		public abstract static class SessionCallback {
	/**		/**
	* This is called after {@link TvInputManager#createSession} has been processed.		* This is called after {@link TvInputManager#createSession} has been processed.
	@@ -214,6 +215,7 @@ public final class TvInputManager {
	* @param eventArgs Optional arguments of the event.		* @param eventArgs Optional arguments of the event.
	* @hide		* @hide
	*/		*/
			@SystemApi
	public void onSessionEvent(Session session, String eventType, Bundle eventArgs) {		public void onSessionEvent(Session session, String eventType, Bundle eventArgs) {
	}		}
	}		}
	@@ -656,6 +658,7 @@ public final class TvInputManager {
	* @throws IllegalArgumentException if any of the arguments is {@code null}.		* @throws IllegalArgumentException if any of the arguments is {@code null}.
	* @hide		* @hide
	*/		*/
			@SystemApi
	public void createSession(String inputId, final SessionCallback callback,		public void createSession(String inputId, final SessionCallback callback,
	Handler handler) {		Handler handler) {
	if (inputId == null) {		if (inputId == null) {
	@@ -683,6 +686,7 @@ public final class TvInputManager {
	* The Session provides the per-session functionality of TV inputs.		* The Session provides the per-session functionality of TV inputs.
	* @hide		* @hide
	*/		*/
			@SystemApi
	public static final class Session {		public static final class Session {
	static final int DISPATCH_IN_PROGRESS = -1;		static final int DISPATCH_IN_PROGRESS = -1;
	static final int DISPATCH_NOT_HANDLED = 0;		static final int DISPATCH_NOT_HANDLED = 0;
	@@ -707,7 +711,6 @@ public final class TvInputManager {
	private InputChannel mChannel;		private InputChannel mChannel;
	private List<TvTrackInfo> mTracks;		private List<TvTrackInfo> mTracks;

	/** @hide */
	private Session(IBinder token, InputChannel channel, ITvInputManager service, int userId,		private Session(IBinder token, InputChannel channel, ITvInputManager service, int userId,
	int seq, SparseArray<SessionCallbackRecord> sessionCallbackRecordMap) {		int seq, SparseArray<SessionCallbackRecord> sessionCallbackRecordMap) {
	mToken = token;		mToken = token;
	@@ -739,7 +742,6 @@ public final class TvInputManager {
	* Sets the {@link android.view.Surface} for this session.		* Sets the {@link android.view.Surface} for this session.
	*		*
	* @param surface A {@link android.view.Surface} used to render video.		* @param surface A {@link android.view.Surface} used to render video.
	* @hide
	*/		*/
	public void setSurface(Surface surface) {		public void setSurface(Surface surface) {
	if (mToken == null) {		if (mToken == null) {
	@@ -763,6 +765,7 @@ public final class TvInputManager {
	* @param height The new height of the {@link Surface}.		* @param height The new height of the {@link Surface}.
	* @hide		* @hide
	*/		*/
			@SystemApi
	public void dispatchSurfaceChanged(int format, int width, int height) {		public void dispatchSurfaceChanged(int format, int width, int height) {
	if (mToken == null) {		if (mToken == null) {
	Log.w(TAG, "The session has been already released");		Log.w(TAG, "The session has been already released");

media/java/android/media/tv/TvView.java

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -230,6 +230,7 @@ public class TvView extends ViewGroup {
	* @see TvInputService.Session#dispatchContentBlocked(TvContentRating)		* @see TvInputService.Session#dispatchContentBlocked(TvContentRating)
	* @hide		* @hide
	*/		*/
			@SystemApi
	public void requestUnblockContent(TvContentRating unblockedRating) {		public void requestUnblockContent(TvContentRating unblockedRating) {
	if (mSession != null) {		if (mSession != null) {
	mSession.requestUnblockContent(unblockedRating);		mSession.requestUnblockContent(unblockedRating);
	@@ -622,6 +623,7 @@ public class TvView extends ViewGroup {
	* @param eventArgs Optional arguments of the event.		* @param eventArgs Optional arguments of the event.
	* @hide		* @hide
	*/		*/
			@SystemApi
	public void onEvent(String inputId, String eventType, Bundle eventArgs) {		public void onEvent(String inputId, String eventType, Bundle eventArgs) {
	}		}
	}		}