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

Commit 3c152d46 authored by Shubang Lu's avatar Shubang Lu
Browse files

[MQ API] Unhide APIs of picture profile

Test: mmm
Flag: android.media.tv.flags.media_quality_fw
Bug: 374849325
API-Coverage-Bug: 378154044

Change-Id: I2a9e7dec415c90aab15282641e1e37d3dfb01e08
parent e2f85e6e
Loading
Loading
Loading
Loading
+39 −0
Original line number Diff line number Diff line
@@ -27055,6 +27055,45 @@ package android.media.projection {
}
package android.media.quality {
  @FlaggedApi("android.media.tv.flags.media_quality_fw") public class MediaQualityContract {
  }
  public static final class MediaQualityContract.PictureQuality {
    field public static final String PARAMETER_BRIGHTNESS = "brightness";
    field public static final String PARAMETER_CONTRAST = "contrast";
    field public static final String PARAMETER_SATURATION = "saturation";
    field public static final String PARAMETER_SHARPNESS = "sharpness";
  }
  @FlaggedApi("android.media.tv.flags.media_quality_fw") public final class MediaQualityManager {
    method @NonNull public java.util.List<android.media.quality.PictureProfile> getAvailablePictureProfiles();
  }
  @FlaggedApi("android.media.tv.flags.media_quality_fw") public final class PictureProfile implements android.os.Parcelable {
    method public int describeContents();
    method @Nullable public String getInputId();
    method @NonNull public String getName();
    method @Nullable public String getPackageName();
    method @NonNull public android.os.PersistableBundle getParameters();
    method @Nullable public String getProfileId();
    method public int getProfileType();
    method public void writeToParcel(@NonNull android.os.Parcel, int);
    field @NonNull public static final android.os.Parcelable.Creator<android.media.quality.PictureProfile> CREATOR;
    field public static final int TYPE_APPLICATION = 2; // 0x2
    field public static final int TYPE_SYSTEM = 1; // 0x1
  }
  public static final class PictureProfile.Builder {
    ctor public PictureProfile.Builder(@NonNull String);
    ctor public PictureProfile.Builder(@NonNull android.media.quality.PictureProfile);
    method @NonNull public android.media.quality.PictureProfile build();
    method @NonNull public android.media.quality.PictureProfile.Builder setParameters(@NonNull android.os.PersistableBundle);
  }
}
package android.media.session {
  public final class MediaController {
+10 −0
Original line number Diff line number Diff line
@@ -8111,6 +8111,16 @@ package android.media.musicrecognition {
}
package android.media.quality {
  public static final class PictureProfile.Builder {
    method @NonNull public android.media.quality.PictureProfile.Builder setInputId(@NonNull String);
    method @NonNull public android.media.quality.PictureProfile.Builder setPackageName(@NonNull String);
    method @NonNull public android.media.quality.PictureProfile.Builder setProfileType(int);
  }
}
package android.media.session {
  public final class MediaSessionManager {
+1 −3
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.media.tv.flags.Flags;
/**
 * The contract between the media quality service and applications. Contains definitions for the
 * commonly used parameter names.
 * @hide
 */
@FlaggedApi(Flags.FLAG_MEDIA_QUALITY_FW)
public class MediaQualityContract {
@@ -42,9 +41,8 @@ public class MediaQualityContract {

    /**
     * Parameters picture quality.
     * @hide
     */
    public static final class PictureQuality implements BaseParameters {
    public static final class PictureQuality {
        /**
         * The brightness.
         *
+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ import java.util.concurrent.Executor;
/**
 * Central system API to the overall media quality, which arbitrates interaction between
 * applications and media quality service.
 * @hide
 */
@FlaggedApi(Flags.FLAG_MEDIA_QUALITY_FW)
@SystemService(Context.MEDIA_QUALITY_SERVICE)
+27 −27
Original line number Diff line number Diff line
@@ -18,11 +18,12 @@ package android.media.quality;

import android.annotation.FlaggedApi;
import android.annotation.IntDef;
import android.annotation.SystemApi;
import android.media.tv.TvInputInfo;
import android.media.tv.flags.Flags;
import android.os.Bundle;
import android.os.Parcel;
import android.os.Parcelable;
import android.os.PersistableBundle;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@@ -33,7 +34,6 @@ import java.lang.annotation.RetentionPolicy;

/**
 * Profile for picture quality.
 * @hide
 */
@FlaggedApi(Flags.FLAG_MEDIA_QUALITY_FW)
public final class PictureProfile implements Parcelable {
@@ -47,7 +47,7 @@ public final class PictureProfile implements Parcelable {
    @NonNull
    private final String mPackageName;
    @NonNull
    private final Bundle mParams;
    private final PersistableBundle mParams;

    /** @hide */
    @Retention(RetentionPolicy.SOURCE)
@@ -59,14 +59,14 @@ public final class PictureProfile implements Parcelable {
    /**
     * System profile type.
     *
     * <p>A profile of system type is managed by the system, and readable to the package define in
     * <p>A profile of system type is managed by the system, and readable to the package returned by
     * {@link #getPackageName()}.
     */
    public static final int TYPE_SYSTEM = 1;
    /**
     * Application profile type.
     *
     * <p>A profile of application type is managed by the package define in
     * <p>A profile of application type is managed by the package returned by
     * {@link #getPackageName()}.
     */
    public static final int TYPE_APPLICATION = 2;
@@ -125,7 +125,7 @@ public final class PictureProfile implements Parcelable {
        mName = in.readString();
        mInputId = in.readString();
        mPackageName = in.readString();
        mParams = in.readBundle();
        mParams = in.readPersistableBundle();
    }

    @Override
@@ -135,7 +135,7 @@ public final class PictureProfile implements Parcelable {
        dest.writeString(mName);
        dest.writeString(mInputId);
        dest.writeString(mPackageName);
        dest.writeBundle(mParams);
        dest.writePersistableBundle(mParams);
    }

    @Override
@@ -168,7 +168,7 @@ public final class PictureProfile implements Parcelable {
            @NonNull String name,
            @Nullable String inputId,
            @NonNull String packageName,
            @NonNull Bundle params) {
            @NonNull PersistableBundle params) {
        this.mId = id;
        this.mType = type;
        this.mName = name;
@@ -251,13 +251,12 @@ public final class PictureProfile implements Parcelable {
     * {@link MediaQualityContract.PictureQuality}.
     */
    @NonNull
    public Bundle getParameters() {
        return new Bundle(mParams);
    public PersistableBundle getParameters() {
        return new PersistableBundle(mParams);
    }

    /**
     * A builder for {@link PictureProfile}.
     * @hide
     */
    public static final class Builder {
        @Nullable
@@ -270,7 +269,7 @@ public final class PictureProfile implements Parcelable {
        @NonNull
        private String mPackageName;
        @NonNull
        private Bundle mParams;
        private PersistableBundle mParams;

        /**
         * Creates a new Builder.
@@ -291,27 +290,26 @@ public final class PictureProfile implements Parcelable {
            mParams = p.getParameters();
        }

        /* @hide using by MediaQualityService */

        /**
         * Only used by system to assign the ID.
         * Sets profile type.
         *
         * @hide
         */
        @SystemApi
        @RequiresPermission(android.Manifest.permission.MANAGE_GLOBAL_PICTURE_QUALITY_SERVICE)
        @NonNull
        public Builder setProfileId(@Nullable String id) {
            mId = id;
        public Builder setProfileType(@ProfileType int value) {
            mType = value;
            return this;
        }

        /**
         * Sets profile type.
         *
         * @hide @SystemApi
         * Only used by system to assign the ID.
         * @hide
         */
        @RequiresPermission(android.Manifest.permission.MANAGE_GLOBAL_PICTURE_QUALITY_SERVICE)
        @NonNull
        public Builder setProfileType(@ProfileType int value) {
            mType = value;
        public Builder setProfileId(@Nullable String id) {
            mId = id;
            return this;
        }

@@ -320,8 +318,9 @@ public final class PictureProfile implements Parcelable {
         *
         * @see PictureProfile#getInputId()
         *
         * @hide @SystemApi
         * @hide
         */
        @SystemApi
        @RequiresPermission(android.Manifest.permission.MANAGE_GLOBAL_PICTURE_QUALITY_SERVICE)
        @NonNull
        public Builder setInputId(@NonNull String value) {
@@ -334,8 +333,9 @@ public final class PictureProfile implements Parcelable {
         *
         * @see PictureProfile#getPackageName()
         *
         * @hide @SystemApi
         * @hide
         */
        @SystemApi
        @RequiresPermission(android.Manifest.permission.MANAGE_GLOBAL_PICTURE_QUALITY_SERVICE)
        @NonNull
        public Builder setPackageName(@NonNull String value) {
@@ -349,8 +349,8 @@ public final class PictureProfile implements Parcelable {
         * @see PictureProfile#getParameters()
         */
        @NonNull
        public Builder setParameters(@NonNull Bundle params) {
            mParams = new Bundle(params);
        public Builder setParameters(@NonNull PersistableBundle params) {
            mParams = new PersistableBundle(params);
            return this;
        }

Loading