Merge "[MQ API] Unhide APIs of MediaQualityManager (part 2)" into main (dda3e3f7) · Commits · e / os / android_frameworks_base

core/api/current.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -27068,9 +27068,12 @@ package android.media.quality {
		}

		@FlaggedApi("android.media.tv.flags.media_quality_fw") public final class MediaQualityManager {
		method public void createPictureProfile(@NonNull android.media.quality.PictureProfile);
		method @NonNull public java.util.List<android.media.quality.PictureProfile> getAvailablePictureProfiles();
		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 public boolean isAutoPictureQualityEnabled();
		method public boolean isSuperResolutionEnabled();
		method public void registerPictureProfileCallback(@NonNull java.util.concurrent.Executor, @NonNull android.media.quality.MediaQualityManager.PictureProfileCallback);
		method public void removePictureProfile(@NonNull String);
		method public void unregisterPictureProfileCallback(@NonNull android.media.quality.MediaQualityManager.PictureProfileCallback);

core/api/system-current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -8154,7 +8154,9 @@ package android.media.quality {
		method @NonNull public java.util.List<java.lang.String> getPictureProfileAllowList();
		method @NonNull public java.util.List<java.lang.String> getPictureProfilePackageNames();
		method @NonNull public java.util.List<android.media.quality.PictureProfile> getPictureProfilesByPackage(@NonNull String);
		method public void setAutoPictureQualityEnabled(boolean);
		method public void setPictureProfileAllowList(@NonNull java.util.List<java.lang.String>);
		method public void setSuperResolutionEnabled(boolean);
		}

		public static final class PictureProfile.Builder {

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

+6 −8

Original line number	Diff line number	Diff line
		@@ -275,14 +275,12 @@ public final class MediaQualityManager {
		/**
		* Creates a picture profile and store it in the system.
		*
		* @return the stored profile with an assigned profile ID. {@code null} if it's not created
		* successfully.
		* @hide
		* <p>If the profile is created successfully,
		* {@link PictureProfileCallback#onPictureProfileAdded(String, PictureProfile)} is invoked.
		*/
		@Nullable
		public PictureProfile createPictureProfile(@NonNull PictureProfile pp) {
		public void createPictureProfile(@NonNull PictureProfile pp) {
		try {
		return mService.createPictureProfile(pp);
		mService.createPictureProfile(pp);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		@@ -542,6 +540,7 @@ public final class MediaQualityManager {
		* @param enabled {@code true} to enable, {@code false} to disable.
		* @hide
		*/
		@SystemApi
		@RequiresPermission(android.Manifest.permission.MANAGE_GLOBAL_PICTURE_QUALITY_SERVICE)
		public void setAutoPictureQualityEnabled(boolean enabled) {
		try {
		@@ -553,7 +552,6 @@ public final class MediaQualityManager {

		/**
		* Returns {@code true} if auto picture quality is enabled; {@code false} otherwise.
		* @hide
		*/
		public boolean isAutoPictureQualityEnabled() {
		try {
		@@ -570,6 +568,7 @@ public final class MediaQualityManager {
		* @param enabled {@code true} to enable, {@code false} to disable.
		* @hide
		*/
		@SystemApi
		@RequiresPermission(android.Manifest.permission.MANAGE_GLOBAL_PICTURE_QUALITY_SERVICE)
		public void setSuperResolutionEnabled(boolean enabled) {
		try {
		@@ -581,7 +580,6 @@ public final class MediaQualityManager {

		/**
		* Returns {@code true} if super resolution is enabled; {@code false} otherwise.
		* @hide
		*/
		public boolean isSuperResolutionEnabled() {
		try {