Merge "[MQ API] Unhide ambient backlight APIs" into main (e0b0cf79) · Commits · e / os / android_frameworks_base

core/api/current.txt

+57 −0

Original line number	Original line	Diff line number	Diff line
	@@ -27062,6 +27062,53 @@ package android.media.projection {

	package android.media.quality {		package android.media.quality {

			@FlaggedApi("android.media.tv.flags.media_quality_fw") public final class AmbientBacklightEvent implements android.os.Parcelable {
			ctor public AmbientBacklightEvent(int, @Nullable android.media.quality.AmbientBacklightMetadata);
			method public int describeContents();
			method public int getEventType();
			method @Nullable public android.media.quality.AmbientBacklightMetadata getMetadata();
			method public void writeToParcel(@NonNull android.os.Parcel, int);
			field public static final int AMBIENT_BACKLIGHT_EVENT_DISABLED = 2; // 0x2
			field public static final int AMBIENT_BACKLIGHT_EVENT_ENABLED = 1; // 0x1
			field public static final int AMBIENT_BACKLIGHT_EVENT_INTERRUPTED = 4; // 0x4
			field public static final int AMBIENT_BACKLIGHT_EVENT_METADATA = 3; // 0x3
			field @NonNull public static final android.os.Parcelable.Creator<android.media.quality.AmbientBacklightEvent> CREATOR;
			}

			@FlaggedApi("android.media.tv.flags.media_quality_fw") public final class AmbientBacklightMetadata implements android.os.Parcelable {
			ctor public AmbientBacklightMetadata(@NonNull String, int, int, int, int, int, @NonNull int[]);
			method public int describeContents();
			method public int getColorFormat();
			method public int getCompressAlgorithm();
			method @IntRange(from=0) public int getHorizontalZonesNumber();
			method @NonNull public String getPackageName();
			method public int getSource();
			method @IntRange(from=0) public int getVerticalZonesNumber();
			method @NonNull public int[] getZonesColors();
			method public void writeToParcel(@NonNull android.os.Parcel, int);
			field @NonNull public static final android.os.Parcelable.Creator<android.media.quality.AmbientBacklightMetadata> CREATOR;
			}

			@FlaggedApi("android.media.tv.flags.media_quality_fw") public final class AmbientBacklightSettings implements android.os.Parcelable {
			ctor public AmbientBacklightSettings(int, int, int, int, int, boolean, int);
			method public int describeContents();
			method public int getColorFormat();
			method @IntRange(from=0) public int getHorizontalZonesNumber();
			method @IntRange(from=1) public int getMaxFps();
			method public int getSource();
			method public int getThreshold();
			method @IntRange(from=0) public int getVerticalZonesNumber();
			method public boolean isLetterboxOmitted();
			method public void writeToParcel(@NonNull android.os.Parcel, int);
			field public static final int ALGORITHM_NONE = 0; // 0x0
			field public static final int ALGORITHM_RLE = 1; // 0x1
			field @NonNull public static final android.os.Parcelable.Creator<android.media.quality.AmbientBacklightSettings> CREATOR;
			field public static final int SOURCE_AUDIO = 1; // 0x1
			field public static final int SOURCE_AUDIO_VIDEO = 3; // 0x3
			field public static final int SOURCE_NONE = 0; // 0x0
			field public static final int SOURCE_VIDEO = 2; // 0x2
			}

	@FlaggedApi("android.media.tv.flags.media_quality_fw") public class MediaQualityContract {		@FlaggedApi("android.media.tv.flags.media_quality_fw") public class MediaQualityContract {
	}		}

	@@ -27086,19 +27133,29 @@ package android.media.quality {
	method @NonNull public java.util.List<android.media.quality.ParamCapability> getParamCapabilities(@NonNull java.util.List<java.lang.String>);		method @NonNull public java.util.List<android.media.quality.ParamCapability> getParamCapabilities(@NonNull java.util.List<java.lang.String>);
	method @Nullable public android.media.quality.PictureProfile getPictureProfile(int, @NonNull String);		method @Nullable public android.media.quality.PictureProfile getPictureProfile(int, @NonNull String);
	method @Nullable public android.media.quality.SoundProfile getSoundProfile(int, @NonNull String);		method @Nullable public android.media.quality.SoundProfile getSoundProfile(int, @NonNull String);
			method public boolean isAmbientBacklightEnabled();
	method public boolean isAutoPictureQualityEnabled();		method public boolean isAutoPictureQualityEnabled();
	method public boolean isAutoSoundQualityEnabled();		method public boolean isAutoSoundQualityEnabled();
	method public boolean isSuperResolutionEnabled();		method public boolean isSuperResolutionEnabled();
			method public void registerAmbientBacklightCallback(@NonNull java.util.concurrent.Executor, @NonNull android.media.quality.MediaQualityManager.AmbientBacklightCallback);
	method public void registerPictureProfileCallback(@NonNull java.util.concurrent.Executor, @NonNull android.media.quality.MediaQualityManager.PictureProfileCallback);		method public void registerPictureProfileCallback(@NonNull java.util.concurrent.Executor, @NonNull android.media.quality.MediaQualityManager.PictureProfileCallback);
	method public void registerSoundProfileCallback(@NonNull java.util.concurrent.Executor, @NonNull android.media.quality.MediaQualityManager.SoundProfileCallback);		method public void registerSoundProfileCallback(@NonNull java.util.concurrent.Executor, @NonNull android.media.quality.MediaQualityManager.SoundProfileCallback);
	method public void removePictureProfile(@NonNull String);		method public void removePictureProfile(@NonNull String);
	method public void removeSoundProfile(@NonNull String);		method public void removeSoundProfile(@NonNull String);
			method public void setAmbientBacklightEnabled(boolean);
			method public void setAmbientBacklightSettings(@NonNull android.media.quality.AmbientBacklightSettings);
			method public void unregisterAmbientBacklightCallback(@NonNull android.media.quality.MediaQualityManager.AmbientBacklightCallback);
	method public void unregisterPictureProfileCallback(@NonNull android.media.quality.MediaQualityManager.PictureProfileCallback);		method public void unregisterPictureProfileCallback(@NonNull android.media.quality.MediaQualityManager.PictureProfileCallback);
	method public void unregisterSoundProfileCallback(@NonNull android.media.quality.MediaQualityManager.SoundProfileCallback);		method public void unregisterSoundProfileCallback(@NonNull android.media.quality.MediaQualityManager.SoundProfileCallback);
	method public void updatePictureProfile(@NonNull String, @NonNull android.media.quality.PictureProfile);		method public void updatePictureProfile(@NonNull String, @NonNull android.media.quality.PictureProfile);
	method public void updateSoundProfile(@NonNull String, @NonNull android.media.quality.SoundProfile);		method public void updateSoundProfile(@NonNull String, @NonNull android.media.quality.SoundProfile);
	}		}

			public abstract static class MediaQualityManager.AmbientBacklightCallback {
			ctor public MediaQualityManager.AmbientBacklightCallback();
			method public void onAmbientBacklightEvent(@NonNull android.media.quality.AmbientBacklightEvent);
			}

	public abstract static class MediaQualityManager.PictureProfileCallback {		public abstract static class MediaQualityManager.PictureProfileCallback {
	ctor public MediaQualityManager.PictureProfileCallback();		ctor public MediaQualityManager.PictureProfileCallback();
	method public void onError(int);		method public void onError(int);

media/java/android/media/quality/AmbientBacklightEvent.java

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -30,7 +30,6 @@ import java.util.Objects;

	/**		/**
	* Ambient backlight event		* Ambient backlight event
	* @hide
	*/		*/
	@FlaggedApi(Flags.FLAG_MEDIA_QUALITY_FW)		@FlaggedApi(Flags.FLAG_MEDIA_QUALITY_FW)
	public final class AmbientBacklightEvent implements Parcelable {		public final class AmbientBacklightEvent implements Parcelable {

media/java/android/media/quality/AmbientBacklightMetadata.java

+10 −5

Original line number	Original line	Diff line number	Diff line
	@@ -32,7 +32,6 @@ import java.util.Arrays;
	*		*
	* <p>A metadata instance is sent from ambient backlight hardware in a {@link AmbientBacklightEvent}		* <p>A metadata instance is sent from ambient backlight hardware in a {@link AmbientBacklightEvent}
	* with {@link AmbientBacklightEvent#AMBIENT_BACKLIGHT_EVENT_METADATA}.		* with {@link AmbientBacklightEvent#AMBIENT_BACKLIGHT_EVENT_METADATA}.
	* @hide
	*/		*/
	@FlaggedApi(Flags.FLAG_MEDIA_QUALITY_FW)		@FlaggedApi(Flags.FLAG_MEDIA_QUALITY_FW)
	public final class AmbientBacklightMetadata implements Parcelable {		public final class AmbientBacklightMetadata implements Parcelable {
	@@ -78,7 +77,6 @@ public final class AmbientBacklightMetadata implements Parcelable {

	/**		/**
	* Gets package name of the metadata.		* Gets package name of the metadata.
	* @hide
	*/		*/
	@NonNull		@NonNull
	public String getPackageName() {		public String getPackageName() {
	@@ -130,11 +128,18 @@ public final class AmbientBacklightMetadata implements Parcelable {
	}		}

	/**		/**
	* Gets color data of vertical color zones.		* Gets color data of all available color zones.
	* @hide		*
			* <p>The format of the color data can be found at {@link #getColorFormat()}.
			*
			* @return an array of color data, in row by row (left-to-right then top-to-bottom) order of the
			* color zones.
			*
			* @see #getHorizontalZonesNumber()
			* @see #getVerticalZonesNumber()
	*/		*/
	@NonNull		@NonNull
	public int[] getVerticalZonesColors() {		public int[] getZonesColors() {
	return mZonesColors;		return mZonesColors;
	}		}

media/java/android/media/quality/AmbientBacklightSettings.java

+1 −14

Original line number	Original line	Diff line number	Diff line
	@@ -31,7 +31,6 @@ import java.lang.annotation.RetentionPolicy;

	/**		/**
	* Settings to configure ambient backlight hardware.		* Settings to configure ambient backlight hardware.
	* @hide
	*/		*/
	@FlaggedApi(Flags.FLAG_MEDIA_QUALITY_FW)		@FlaggedApi(Flags.FLAG_MEDIA_QUALITY_FW)
	public final class AmbientBacklightSettings implements Parcelable {		public final class AmbientBacklightSettings implements Parcelable {
	@@ -60,16 +59,6 @@ public final class AmbientBacklightSettings implements Parcelable {
	*/		*/
	public static final int SOURCE_AUDIO_VIDEO = 3;		public static final int SOURCE_AUDIO_VIDEO = 3;

	/** @hide */
	@Retention(RetentionPolicy.SOURCE)
	@IntDef({COLOR_FORMAT_RGB888})
	public @interface ColorFormat {}

	/**
	* The color format is RGB888.
	* @hide
	*/
	public static final int COLOR_FORMAT_RGB888 = 1;

	/** @hide */		/** @hide */
	@Retention(RetentionPolicy.SOURCE)		@Retention(RetentionPolicy.SOURCE)
	@@ -201,7 +190,6 @@ public final class AmbientBacklightSettings implements Parcelable {
	*		*
	* <p>Letter-box is a technique to keep the original aspect ratio when displayed on a screen		* <p>Letter-box is a technique to keep the original aspect ratio when displayed on a screen
	* with different aspect ratio. Black bars are added to the top and bottom.		* with different aspect ratio. Black bars are added to the top and bottom.
	* @hide
	*/		*/
	public boolean isLetterboxOmitted() {		public boolean isLetterboxOmitted() {
	return mIsLetterboxOmitted;		return mIsLetterboxOmitted;
	@@ -210,9 +198,8 @@ public final class AmbientBacklightSettings implements Parcelable {
	/**		/**
	* Gets the detection threshold of the ambient light.		* Gets the detection threshold of the ambient light.
	*		*
	* <p>If the color of a color zone is changed by the difference is smaller than the threshold,		* <p>If the color of a color zone is changed but the difference is smaller than the threshold,
	* the change is ignored.		* the change is ignored.
	* @hide
	*/		*/
	public int getThreshold() {		public int getThreshold() {
	return mThreshold;		return mThreshold;

media/java/android/media/quality/MediaQualityManager.java

+0 −6

Original line number	Original line	Diff line number	Diff line
	@@ -630,7 +630,6 @@ public final class MediaQualityManager {

	/**		/**
	* Registers a {@link AmbientBacklightCallback}.		* Registers a {@link AmbientBacklightCallback}.
	* @hide
	*/		*/
	public void registerAmbientBacklightCallback(		public void registerAmbientBacklightCallback(
	@NonNull @CallbackExecutor Executor executor,		@NonNull @CallbackExecutor Executor executor,
	@@ -644,7 +643,6 @@ public final class MediaQualityManager {

	/**		/**
	* Unregisters the existing {@link AmbientBacklightCallback}.		* Unregisters the existing {@link AmbientBacklightCallback}.
	* @hide
	*/		*/
	public void unregisterAmbientBacklightCallback(		public void unregisterAmbientBacklightCallback(
	@NonNull final AmbientBacklightCallback callback) {		@NonNull final AmbientBacklightCallback callback) {
	@@ -665,7 +663,6 @@ public final class MediaQualityManager {
	* Set the ambient backlight settings.		* Set the ambient backlight settings.
	*		*
	* @param settings The settings to use for the backlight detector.		* @param settings The settings to use for the backlight detector.
	* @hide
	*/		*/
	public void setAmbientBacklightSettings(		public void setAmbientBacklightSettings(
	@NonNull AmbientBacklightSettings settings) {		@NonNull AmbientBacklightSettings settings) {
	@@ -679,7 +676,6 @@ public final class MediaQualityManager {

	/**		/**
	* Returns {@code true} if ambient backlight is enabled; {@code false} otherwise.		* Returns {@code true} if ambient backlight is enabled; {@code false} otherwise.
	* @hide
	*/		*/
	public boolean isAmbientBacklightEnabled() {		public boolean isAmbientBacklightEnabled() {
	try {		try {
	@@ -693,7 +689,6 @@ public final class MediaQualityManager {
	* Enables or disables the ambient backlight detection.		* Enables or disables the ambient backlight detection.
	*		*
	* @param enabled {@code true} to enable, {@code false} to disable.		* @param enabled {@code true} to enable, {@code false} to disable.
	* @hide
	*/		*/
	public void setAmbientBacklightEnabled(boolean enabled) {		public void setAmbientBacklightEnabled(boolean enabled) {
	try {		try {
	@@ -959,7 +954,6 @@ public final class MediaQualityManager {

	/**		/**
	* Callback used to monitor status of ambient backlight.		* Callback used to monitor status of ambient backlight.
	* @hide
	*/		*/
	public abstract static class AmbientBacklightCallback {		public abstract static class AmbientBacklightCallback {
	/**		/**