Merge "[MQ API feedback] Change param -> parameter for consistency" into main (fb98bff1) · Commits · e / os / android_frameworks_base

core/api/current.txt

+8 −7

Original line number	Diff line number	Diff line
		@@ -27309,7 +27309,7 @@ package android.media.quality {
		method public void createSoundProfile(@NonNull android.media.quality.SoundProfile);
		method @NonNull public java.util.List<android.media.quality.PictureProfile> getAvailablePictureProfiles(@Nullable android.media.quality.MediaQualityManager.ProfileQueryParams);
		method @NonNull public java.util.List<android.media.quality.SoundProfile> getAvailableSoundProfiles(@Nullable android.media.quality.MediaQualityManager.ProfileQueryParams);
		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.ParameterCapability> getParameterCapabilities(@NonNull java.util.List<java.lang.String>);
		method @Nullable public android.media.quality.PictureProfile getPictureProfile(int, @NonNull String, @Nullable android.media.quality.MediaQualityManager.ProfileQueryParams);
		method @Nullable public android.media.quality.SoundProfile getSoundProfile(int, @NonNull String, @Nullable android.media.quality.MediaQualityManager.ProfileQueryParams);
		method public boolean isAmbientBacklightEnabled();
		@@ -27338,7 +27338,7 @@ package android.media.quality {
		public abstract static class MediaQualityManager.PictureProfileCallback {
		ctor public MediaQualityManager.PictureProfileCallback();
		method public void onError(@Nullable String, int);
		method public void onParamCapabilitiesChanged(@Nullable String, @NonNull java.util.List<android.media.quality.ParamCapability>);
		method public void onParameterCapabilitiesChanged(@Nullable String, @NonNull java.util.List<android.media.quality.ParameterCapability>);
		method public void onPictureProfileAdded(@NonNull String, @NonNull android.media.quality.PictureProfile);
		method public void onPictureProfileRemoved(@NonNull String, @NonNull android.media.quality.PictureProfile);
		method public void onPictureProfileUpdated(@NonNull String, @NonNull android.media.quality.PictureProfile);
		@@ -27360,27 +27360,28 @@ package android.media.quality {
		public abstract static class MediaQualityManager.SoundProfileCallback {
		ctor public MediaQualityManager.SoundProfileCallback();
		method public void onError(@Nullable String, int);
		method public void onParamCapabilitiesChanged(@Nullable String, @NonNull java.util.List<android.media.quality.ParamCapability>);
		method public void onParameterCapabilitiesChanged(@Nullable String, @NonNull java.util.List<android.media.quality.ParameterCapability>);
		method public void onSoundProfileAdded(@NonNull String, @NonNull android.media.quality.SoundProfile);
		method public void onSoundProfileRemoved(@NonNull String, @NonNull android.media.quality.SoundProfile);
		method public void onSoundProfileUpdated(@NonNull String, @NonNull android.media.quality.SoundProfile);
		}

		@FlaggedApi("android.media.tv.flags.media_quality_fw") public final class ParamCapability implements android.os.Parcelable {
		@FlaggedApi("android.media.tv.flags.media_quality_fw") public final class ParameterCapability implements android.os.Parcelable {
		method public int describeContents();
		method @NonNull public android.os.Bundle getCapabilities();
		method @NonNull public String getParamName();
		method public int getParamType();
		method @NonNull public String getParameterName();
		method public int getParameterType();
		method public boolean isSupported();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field public static final String CAPABILITY_DEFAULT = "default";
		field public static final String CAPABILITY_ENUM = "enum";
		field public static final String CAPABILITY_MAX = "max";
		field public static final String CAPABILITY_MIN = "min";
		field @NonNull public static final android.os.Parcelable.Creator<android.media.quality.ParamCapability> CREATOR;
		field @NonNull public static final android.os.Parcelable.Creator<android.media.quality.ParameterCapability> CREATOR;
		field public static final int TYPE_DOUBLE = 3; // 0x3
		field public static final int TYPE_INT = 1; // 0x1
		field public static final int TYPE_LONG = 2; // 0x2
		field public static final int TYPE_NONE = 0; // 0x0
		field public static final int TYPE_STRING = 4; // 0x4
		}

media/java/android/media/quality/IMediaQualityManager.aidl

+2 −2

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@ import android.media.quality.AmbientBacklightSettings;
		import android.media.quality.IAmbientBacklightCallback;
		import android.media.quality.IPictureProfileCallback;
		import android.media.quality.ISoundProfileCallback;
		import android.media.quality.ParamCapability;
		import android.media.quality.ParameterCapability;
		import android.media.quality.PictureProfileHandle;
		import android.media.quality.PictureProfile;
		import android.media.quality.SoundProfileHandle;
		@@ -65,7 +65,7 @@ interface IMediaQualityManager {
		void registerSoundProfileCallback(in ISoundProfileCallback cb);
		void registerAmbientBacklightCallback(in IAmbientBacklightCallback cb);

		List<ParamCapability> getParamCapabilities(in List<String> names, in UserHandle user);
		List<ParameterCapability> getParameterCapabilities(in List<String> names, in UserHandle user);

		boolean isSupported(in UserHandle user);
		void setAutoPictureQualityEnabled(in boolean enabled, in UserHandle user);

media/java/android/media/quality/IPictureProfileCallback.aidl

+2 −2

Original line number	Diff line number	Diff line
		@@ -17,7 +17,7 @@

		package android.media.quality;

		import android.media.quality.ParamCapability;
		import android.media.quality.ParameterCapability;
		import android.media.quality.PictureProfile;

		/**
		@@ -28,6 +28,6 @@ oneway interface IPictureProfileCallback {
		void onPictureProfileAdded(in String id, in PictureProfile p);
		void onPictureProfileUpdated(in String id, in PictureProfile p);
		void onPictureProfileRemoved(in String id, in PictureProfile p);
		void onParamCapabilitiesChanged(in String id, in List<ParamCapability> caps);
		void onParameterCapabilitiesChanged(in String id, in List<ParameterCapability> caps);
		void onError(in String id, in int err);
		}

media/java/android/media/quality/ISoundProfileCallback.aidl

+2 −2

Original line number	Diff line number	Diff line
		@@ -17,7 +17,7 @@

		package android.media.quality;

		import android.media.quality.ParamCapability;
		import android.media.quality.ParameterCapability;
		import android.media.quality.SoundProfile;

		/**
		@@ -28,6 +28,6 @@ oneway interface ISoundProfileCallback {
		void onSoundProfileAdded(in String id, in SoundProfile p);
		void onSoundProfileUpdated(in String id, in SoundProfile p);
		void onSoundProfileRemoved(in String id, in SoundProfile p);
		void onParamCapabilitiesChanged(in String id, in List<ParamCapability> caps);
		void onParameterCapabilitiesChanged(in String id, in List<ParameterCapability> caps);
		void onError(in String id, in int err);
		}

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

+24 −14

Original line number	Diff line number	Diff line
		@@ -108,11 +108,12 @@ public final class MediaQualityManager {
		}
		}
		@Override
		public void onParamCapabilitiesChanged(String profileId, List<ParamCapability> caps) {
		public void onParameterCapabilitiesChanged(
		String profileId, List<ParameterCapability> caps) {
		synchronized (mLock) {
		for (PictureProfileCallbackRecord record : mPpCallbackRecords) {
		// TODO: filter callback record
		record.postParamCapabilitiesChanged(profileId, caps);
		record.postParameterCapabilitiesChanged(profileId, caps);
		}
		}
		}
		@@ -155,11 +156,12 @@ public final class MediaQualityManager {
		}
		}
		@Override
		public void onParamCapabilitiesChanged(String profileId, List<ParamCapability> caps) {
		public void onParameterCapabilitiesChanged(
		String profileId, List<ParameterCapability> caps) {
		synchronized (mLock) {
		for (SoundProfileCallbackRecord record : mSpCallbackRecords) {
		// TODO: filter callback record
		record.postParamCapabilitiesChanged(profileId, caps);
		record.postParameterCapabilitiesChanged(profileId, caps);
		}
		}
		}
		@@ -596,11 +598,17 @@ public final class MediaQualityManager {

		/**
		* Gets capability information of the given parameters.
		*
		* <p>If a name isn't found, a corresponding {@link ParameterCapability} instance is in the
		* return list, and {@link ParameterCapability#isSupported()} is {@code false}.
		*
		* @param names the parameter names. Commonly used names can be found in
		* {@link MediaQualityContract}. Vendor-defined names are also permitted.
		*/
		@NonNull
		public List<ParamCapability> getParamCapabilities(@NonNull List<String> names) {
		public List<ParameterCapability> getParameterCapabilities(@NonNull List<String> names) {
		try {
		return mService.getParamCapabilities(names, mUserHandle);
		return mService.getParameterCapabilities(names, mUserHandle);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		@@ -884,11 +892,12 @@ public final class MediaQualityManager {
		});
		}

		public void postParamCapabilitiesChanged(final String id, List<ParamCapability> caps) {
		public void postParameterCapabilitiesChanged(
		final String id, List<ParameterCapability> caps) {
		mExecutor.execute(new Runnable() {
		@Override
		public void run() {
		mCallback.onParamCapabilitiesChanged(id, caps);
		mCallback.onParameterCapabilitiesChanged(id, caps);
		}
		});
		}
		@@ -944,11 +953,12 @@ public final class MediaQualityManager {
		});
		}

		public void postParamCapabilitiesChanged(final String id, List<ParamCapability> caps) {
		public void postParameterCapabilitiesChanged(
		final String id, List<ParameterCapability> caps) {
		mExecutor.execute(new Runnable() {
		@Override
		public void run() {
		mCallback.onParamCapabilitiesChanged(id, caps);
		mCallback.onParameterCapabilitiesChanged(id, caps);
		}
		});
		}
		@@ -1038,8 +1048,8 @@ public final class MediaQualityManager {
		* is no associated profile
		* @param updatedCaps the updated capabilities.
		*/
		public void onParamCapabilitiesChanged(
		@Nullable String profileId, @NonNull List<ParamCapability> updatedCaps) {
		public void onParameterCapabilitiesChanged(
		@Nullable String profileId, @NonNull List<ParameterCapability> updatedCaps) {
		}
		}

		@@ -1095,8 +1105,8 @@ public final class MediaQualityManager {
		* is no associated profile
		* @param updatedCaps the updated capabilities.
		*/
		public void onParamCapabilitiesChanged(
		@Nullable String profileId, @NonNull List<ParamCapability> updatedCaps) {
		public void onParameterCapabilitiesChanged(
		@Nullable String profileId, @NonNull List<ParameterCapability> updatedCaps) {
		}
		}