Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4fbb0864 authored Mar 09, 2023 by David Zhao Committed by Automerger Merge Worker Mar 09, 2023

Merge "API Review: Use intdef for TvMessageType" into udc-dev am: 8c79f224

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21891764

Change-Id: I7fac9f3a2c7d1472430c5d1edbba873f234286c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 3276e7be 8c79f224

core/api/current.txt

+9 −8

Original line number	Original line	Diff line number	Diff line
	@@ -27343,8 +27343,9 @@ package android.media.tv {
	field public static final int TIME_SHIFT_STATUS_UNKNOWN = 0; // 0x0		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 TIME_SHIFT_STATUS_UNSUPPORTED = 1; // 0x1
	field public static final String TV_MESSAGE_KEY_STREAM_ID = "android.media.tv.TvInputManager.stream_id";		field public static final String TV_MESSAGE_KEY_STREAM_ID = "android.media.tv.TvInputManager.stream_id";
	field public static final String TV_MESSAGE_TYPE_CLOSED_CAPTION = "CC";		field public static final int TV_MESSAGE_TYPE_CLOSED_CAPTION = 2; // 0x2
	field public static final String TV_MESSAGE_TYPE_WATERMARK = "Watermark";		field public static final int TV_MESSAGE_TYPE_OTHER = 1000; // 0x3e8
			field public static final int TV_MESSAGE_TYPE_WATERMARK = 1; // 0x1
	field public static final int VIDEO_UNAVAILABLE_REASON_AUDIO_ONLY = 4; // 0x4		field public static final int VIDEO_UNAVAILABLE_REASON_AUDIO_ONLY = 4; // 0x4
	field public static final int VIDEO_UNAVAILABLE_REASON_BUFFERING = 3; // 0x3		field public static final int VIDEO_UNAVAILABLE_REASON_BUFFERING = 3; // 0x3
	field public static final int VIDEO_UNAVAILABLE_REASON_CAS_BLACKOUT = 16; // 0x10		field public static final int VIDEO_UNAVAILABLE_REASON_CAS_BLACKOUT = 16; // 0x10
	@@ -27435,7 +27436,7 @@ package android.media.tv {
	method public void notifyTrackSelected(int, String);		method public void notifyTrackSelected(int, String);
	method public void notifyTracksChanged(java.util.List<android.media.tv.TvTrackInfo>);		method public void notifyTracksChanged(java.util.List<android.media.tv.TvTrackInfo>);
	method public void notifyTuned(@NonNull android.net.Uri);		method public void notifyTuned(@NonNull android.net.Uri);
	method public void notifyTvMessage(@NonNull String, @NonNull android.os.Bundle);		method public void notifyTvMessage(int, @NonNull android.os.Bundle);
	method public void notifyVideoAvailable();		method public void notifyVideoAvailable();
	method public void notifyVideoUnavailable(int);		method public void notifyVideoUnavailable(int);
	method public void onAdBufferReady(@NonNull android.media.tv.AdBuffer);		method public void onAdBufferReady(@NonNull android.media.tv.AdBuffer);
	@@ -27457,7 +27458,7 @@ package android.media.tv {
	method public void onSetInteractiveAppNotificationEnabled(boolean);		method public void onSetInteractiveAppNotificationEnabled(boolean);
	method public abstract void onSetStreamVolume(@FloatRange(from=0.0, to=1.0) float);		method public abstract void onSetStreamVolume(@FloatRange(from=0.0, to=1.0) float);
	method public abstract boolean onSetSurface(@Nullable android.view.Surface);		method public abstract boolean onSetSurface(@Nullable android.view.Surface);
	method public void onSetTvMessageEnabled(@NonNull String, boolean);		method public void onSetTvMessageEnabled(int, boolean);
	method public void onSurfaceChanged(int, int, int);		method public void onSurfaceChanged(int, int, int);
	method public long onTimeShiftGetCurrentPosition();		method public long onTimeShiftGetCurrentPosition();
	method public long onTimeShiftGetStartPosition();		method public long onTimeShiftGetStartPosition();
	@@ -27600,7 +27601,7 @@ package android.media.tv {
	method public void setOnUnhandledInputEventListener(android.media.tv.TvView.OnUnhandledInputEventListener);		method public void setOnUnhandledInputEventListener(android.media.tv.TvView.OnUnhandledInputEventListener);
	method public void setStreamVolume(@FloatRange(from=0.0, to=1.0) float);		method public void setStreamVolume(@FloatRange(from=0.0, to=1.0) float);
	method public void setTimeShiftPositionCallback(@Nullable android.media.tv.TvView.TimeShiftPositionCallback);		method public void setTimeShiftPositionCallback(@Nullable android.media.tv.TvView.TimeShiftPositionCallback);
	method public void setTvMessageEnabled(@NonNull String, boolean);		method public void setTvMessageEnabled(int, boolean);
	method public void setZOrderMediaOverlay(boolean);		method public void setZOrderMediaOverlay(boolean);
	method public void setZOrderOnTop(boolean);		method public void setZOrderOnTop(boolean);
	method public void timeShiftPause();		method public void timeShiftPause();
	@@ -27641,7 +27642,7 @@ package android.media.tv {
	method public void onTrackSelected(String, int, String);		method public void onTrackSelected(String, int, String);
	method public void onTracksChanged(String, java.util.List<android.media.tv.TvTrackInfo>);		method public void onTracksChanged(String, java.util.List<android.media.tv.TvTrackInfo>);
	method public void onTuned(@NonNull String, @NonNull android.net.Uri);		method public void onTuned(@NonNull String, @NonNull android.net.Uri);
	method public void onTvMessage(@NonNull String, @NonNull String, @NonNull android.os.Bundle);		method public void onTvMessage(@NonNull String, int, @NonNull android.os.Bundle);
	method public void onVideoAvailable(String);		method public void onVideoAvailable(String);
	method public void onVideoSizeChanged(String, int, int);		method public void onVideoSizeChanged(String, int, int);
	method public void onVideoUnavailable(String, int);		method public void onVideoUnavailable(String, int);
	@@ -27801,7 +27802,7 @@ package android.media.tv.interactive {
	method public boolean onTrackballEvent(@NonNull android.view.MotionEvent);		method public boolean onTrackballEvent(@NonNull android.view.MotionEvent);
	method public void onTracksChanged(@NonNull java.util.List<android.media.tv.TvTrackInfo>);		method public void onTracksChanged(@NonNull java.util.List<android.media.tv.TvTrackInfo>);
	method public void onTuned(@NonNull android.net.Uri);		method public void onTuned(@NonNull android.net.Uri);
	method public void onTvMessage(@NonNull String, @NonNull android.os.Bundle);		method public void onTvMessage(int, @NonNull android.os.Bundle);
	method public void onTvRecordingInfo(@Nullable android.media.tv.TvRecordingInfo);		method public void onTvRecordingInfo(@Nullable android.media.tv.TvRecordingInfo);
	method public void onTvRecordingInfoList(@NonNull java.util.List<android.media.tv.TvRecordingInfo>);		method public void onTvRecordingInfoList(@NonNull java.util.List<android.media.tv.TvRecordingInfo>);
	method public void onVideoAvailable();		method public void onVideoAvailable();
	@@ -27865,7 +27866,7 @@ package android.media.tv.interactive {
	method public void notifyTimeShiftPlaybackParams(@NonNull android.media.PlaybackParams);		method public void notifyTimeShiftPlaybackParams(@NonNull android.media.PlaybackParams);
	method public void notifyTimeShiftStartPositionChanged(@NonNull String, long);		method public void notifyTimeShiftStartPositionChanged(@NonNull String, long);
	method public void notifyTimeShiftStatusChanged(@NonNull String, int);		method public void notifyTimeShiftStatusChanged(@NonNull String, int);
	method public void notifyTvMessage(@NonNull String, @NonNull android.os.Bundle);		method public void notifyTvMessage(@NonNull int, @NonNull android.os.Bundle);
	method public void onAttachedToWindow();		method public void onAttachedToWindow();
	method public void onDetachedFromWindow();		method public void onDetachedFromWindow();
	method public void onLayout(boolean, int, int, int, int);		method public void onLayout(boolean, int, int, int, int);

core/api/test-current.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1957,7 +1957,7 @@ package android.media.tv {
	}		}

	public class TvView extends android.view.ViewGroup {		public class TvView extends android.view.ViewGroup {
	method public void notifyTvMessage(@NonNull String, @NonNull android.os.Bundle);		method public void notifyTvMessage(int, @NonNull android.os.Bundle);
	}		}

	}		}

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -55,7 +55,7 @@ oneway interface ITvInputClient {
	void onCueingMessageAvailability(boolean available, int seq);		void onCueingMessageAvailability(boolean available, int seq);
	void onTimeShiftMode(int mode, int seq);		void onTimeShiftMode(int mode, int seq);
	void onAvailableSpeeds(in float[] speeds, int seq);		void onAvailableSpeeds(in float[] speeds, int seq);
	void onTvMessage(in String type, in Bundle data, int seq);		void onTvMessage(int type, in Bundle data, int seq);

	void onTuned(in Uri channelUri, int seq);		void onTuned(in Uri channelUri, int seq);
	// For the recording session		// For the recording session

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -119,7 +119,7 @@ interface ITvInputManager {
	void notifyAdBufferReady(in IBinder sessionToken, in AdBuffer buffer, int userId);		void notifyAdBufferReady(in IBinder sessionToken, in AdBuffer buffer, int userId);

	// For TV Message		// For TV Message
	void notifyTvMessage(in IBinder sessionToken, in String type, in Bundle data, int userId);		void notifyTvMessage(in IBinder sessionToken, int type, in Bundle data, int userId);

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

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -78,5 +78,5 @@ oneway interface ITvInputSession {
	void notifyAdBufferReady(in AdBuffer buffer);		void notifyAdBufferReady(in AdBuffer buffer);

	// For TV messages		// For TV messages
	void notifyTvMessage(in String type, in Bundle data);		void notifyTvMessage(int type, in Bundle data);
	}		}