summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--core/api/current.txt15
-rw-r--r--media/java/android/media/quality/IMediaQualityManager.aidl4
-rw-r--r--media/java/android/media/quality/IPictureProfileCallback.aidl4
-rw-r--r--media/java/android/media/quality/ISoundProfileCallback.aidl4
-rw-r--r--media/java/android/media/quality/MediaQualityManager.java38
-rw-r--r--media/java/android/media/quality/ParameterCapability.aidl (renamed from media/java/android/media/quality/ParamCapability.aidl)2
-rw-r--r--media/java/android/media/quality/ParameterCapability.java (renamed from media/java/android/media/quality/ParamCapability.java)36
-rw-r--r--services/core/java/com/android/server/media/quality/MediaQualityService.java5
8 files changed, 64 insertions, 44 deletions
diff --git a/core/api/current.txt b/core/api/current.txt
index 8b6d3f72c005..59eb31ad9a24 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -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
}
diff --git a/media/java/android/media/quality/IMediaQualityManager.aidl b/media/java/android/media/quality/IMediaQualityManager.aidl
index e6f87aa9915e..6e9fa1dcf93d 100644
--- a/media/java/android/media/quality/IMediaQualityManager.aidl
+++ b/media/java/android/media/quality/IMediaQualityManager.aidl
@@ -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);
diff --git a/media/java/android/media/quality/IPictureProfileCallback.aidl b/media/java/android/media/quality/IPictureProfileCallback.aidl
index 7071a1684fa2..eed77f695416 100644
--- a/media/java/android/media/quality/IPictureProfileCallback.aidl
+++ b/media/java/android/media/quality/IPictureProfileCallback.aidl
@@ -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);
}
diff --git a/media/java/android/media/quality/ISoundProfileCallback.aidl b/media/java/android/media/quality/ISoundProfileCallback.aidl
index 30bb106ef34c..3871fb212259 100644
--- a/media/java/android/media/quality/ISoundProfileCallback.aidl
+++ b/media/java/android/media/quality/ISoundProfileCallback.aidl
@@ -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);
}
diff --git a/media/java/android/media/quality/MediaQualityManager.java b/media/java/android/media/quality/MediaQualityManager.java
index 1dd9f6a5a6e0..191b938b2e26 100644
--- a/media/java/android/media/quality/MediaQualityManager.java
+++ b/media/java/android/media/quality/MediaQualityManager.java
@@ -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) {
}
}
diff --git a/media/java/android/media/quality/ParamCapability.aidl b/media/java/android/media/quality/ParameterCapability.aidl
index b43409d039f2..eb2ac97916f3 100644
--- a/media/java/android/media/quality/ParamCapability.aidl
+++ b/media/java/android/media/quality/ParameterCapability.aidl
@@ -16,4 +16,4 @@
package android.media.quality;
-parcelable ParamCapability;
+parcelable ParameterCapability;
diff --git a/media/java/android/media/quality/ParamCapability.java b/media/java/android/media/quality/ParameterCapability.java
index ed11abd28379..7a28a3657cfd 100644
--- a/media/java/android/media/quality/ParamCapability.java
+++ b/media/java/android/media/quality/ParameterCapability.java
@@ -33,17 +33,23 @@ import java.lang.annotation.RetentionPolicy;
* Capability info of media quality parameters
*/
@FlaggedApi(Flags.FLAG_MEDIA_QUALITY_FW)
-public final class ParamCapability implements Parcelable {
+public final class ParameterCapability implements Parcelable {
/** @hide */
@IntDef(flag = true, prefix = { "TYPE_" }, value = {
+ TYPE_NONE,
TYPE_INT,
TYPE_LONG,
TYPE_DOUBLE,
TYPE_STRING,
})
@Retention(RetentionPolicy.SOURCE)
- public @interface ParamType {}
+ public @interface ParameterType {}
+
+ /**
+ * None parameter type. It's used when a parameter is not supported.
+ */
+ public static final int TYPE_NONE = 0;
/**
* Integer parameter type
@@ -98,13 +104,13 @@ public final class ParamCapability implements Parcelable {
@NonNull
private final String mName;
private final boolean mIsSupported;
- @ParamType
+ @ParameterType
private final int mType;
@NonNull
private final Bundle mCaps;
/** @hide */
- protected ParamCapability(Parcel in) {
+ protected ParameterCapability(Parcel in) {
mName = in.readString();
mIsSupported = in.readBoolean();
mType = in.readInt();
@@ -125,25 +131,25 @@ public final class ParamCapability implements Parcelable {
}
@NonNull
- public static final Creator<ParamCapability> CREATOR = new Creator<ParamCapability>() {
+ public static final Creator<ParameterCapability> CREATOR = new Creator<ParameterCapability>() {
@Override
- public ParamCapability createFromParcel(Parcel in) {
- return new ParamCapability(in);
+ public ParameterCapability createFromParcel(Parcel in) {
+ return new ParameterCapability(in);
}
@Override
- public ParamCapability[] newArray(int size) {
- return new ParamCapability[size];
+ public ParameterCapability[] newArray(int size) {
+ return new ParameterCapability[size];
}
};
/**
- * Creates a new ParamCapability.
+ * Creates a new ParameterCapability.
*
* @hide
*/
- public ParamCapability(
+ public ParameterCapability(
@NonNull String name,
boolean isSupported,
int type,
@@ -158,7 +164,7 @@ public final class ParamCapability implements Parcelable {
* Gets parameter name.
*/
@NonNull
- public String getParamName() {
+ public String getParameterName() {
return mName;
}
@@ -171,9 +177,11 @@ public final class ParamCapability implements Parcelable {
/**
* Gets parameter type.
+ *
+ * <p>It's {@link #TYPE_NONE} if {@link #isSupported()} is {@code false}.
*/
- @ParamType
- public int getParamType() {
+ @ParameterType
+ public int getParameterType() {
return mType;
}
diff --git a/services/core/java/com/android/server/media/quality/MediaQualityService.java b/services/core/java/com/android/server/media/quality/MediaQualityService.java
index fd36d0f62e65..34bb4155c943 100644
--- a/services/core/java/com/android/server/media/quality/MediaQualityService.java
+++ b/services/core/java/com/android/server/media/quality/MediaQualityService.java
@@ -27,7 +27,7 @@ import android.media.quality.IPictureProfileCallback;
import android.media.quality.ISoundProfileCallback;
import android.media.quality.MediaQualityContract.BaseParameters;
import android.media.quality.MediaQualityManager;
-import android.media.quality.ParamCapability;
+import android.media.quality.ParameterCapability;
import android.media.quality.PictureProfile;
import android.media.quality.PictureProfileHandle;
import android.media.quality.SoundProfile;
@@ -544,7 +544,8 @@ public class MediaQualityService extends SystemService {
}
@Override
- public List<ParamCapability> getParamCapabilities(List<String> names, UserHandle user) {
+ public List<ParameterCapability> getParameterCapabilities(
+ List<String> names, UserHandle user) {
return new ArrayList<>();
}
generated by cgit v1.2.3-59-g8ed1b (git 2.39.0) at 2026-01-04 11:27:50 +0000