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

Commit e7356e99 authored by Weilin Xu's avatar Weilin Xu Committed by Android (Google) Code Review
Browse files

Merge "Remove hd_radio_improved flag from radio system APIs" into main

parents d405b2ea 05729f57
Loading
Loading
Loading
Loading
+26 −26
Original line number Diff line number Diff line
@@ -6589,7 +6589,7 @@ package android.hardware.radio {
    method public void addOnCompleteListener(@NonNull android.hardware.radio.ProgramList.OnCompleteListener);
    method public void close();
    method @Deprecated @Nullable public android.hardware.radio.RadioManager.ProgramInfo get(@NonNull android.hardware.radio.ProgramSelector.Identifier);
    method @FlaggedApi("android.hardware.radio.hd_radio_improved") @NonNull public java.util.List<android.hardware.radio.RadioManager.ProgramInfo> getProgramInfos(@NonNull android.hardware.radio.ProgramSelector.Identifier);
    method @NonNull public java.util.List<android.hardware.radio.RadioManager.ProgramInfo> getProgramInfos(@NonNull android.hardware.radio.ProgramSelector.Identifier);
    method public void registerListCallback(@NonNull java.util.concurrent.Executor, @NonNull android.hardware.radio.ProgramList.ListCallback);
    method public void registerListCallback(@NonNull android.hardware.radio.ProgramList.ListCallback);
    method public void removeOnCompleteListener(@NonNull android.hardware.radio.ProgramList.OnCompleteListener);
@@ -6643,7 +6643,7 @@ package android.hardware.radio {
    field @Deprecated public static final int IDENTIFIER_TYPE_DRMO_MODULATION = 11; // 0xb
    field public static final int IDENTIFIER_TYPE_DRMO_SERVICE_ID = 9; // 0x9
    field public static final int IDENTIFIER_TYPE_HD_STATION_ID_EXT = 3; // 0x3
    field @FlaggedApi("android.hardware.radio.hd_radio_improved") public static final int IDENTIFIER_TYPE_HD_STATION_LOCATION = 15; // 0xf
    field public static final int IDENTIFIER_TYPE_HD_STATION_LOCATION = 15; // 0xf
    field public static final int IDENTIFIER_TYPE_HD_STATION_NAME = 10004; // 0x2714
    field @Deprecated public static final int IDENTIFIER_TYPE_HD_SUBCHANNEL = 4; // 0x4
    field public static final int IDENTIFIER_TYPE_INVALID = 0; // 0x0
@@ -6664,14 +6664,14 @@ package android.hardware.radio {
    field @Deprecated public static final int PROGRAM_TYPE_SXM = 7; // 0x7
    field @Deprecated public static final int PROGRAM_TYPE_VENDOR_END = 1999; // 0x7cf
    field @Deprecated public static final int PROGRAM_TYPE_VENDOR_START = 1000; // 0x3e8
    field @FlaggedApi("android.hardware.radio.hd_radio_improved") public static final int SUB_CHANNEL_HD_1 = 1; // 0x1
    field @FlaggedApi("android.hardware.radio.hd_radio_improved") public static final int SUB_CHANNEL_HD_2 = 2; // 0x2
    field @FlaggedApi("android.hardware.radio.hd_radio_improved") public static final int SUB_CHANNEL_HD_3 = 4; // 0x4
    field @FlaggedApi("android.hardware.radio.hd_radio_improved") public static final int SUB_CHANNEL_HD_4 = 8; // 0x8
    field @FlaggedApi("android.hardware.radio.hd_radio_improved") public static final int SUB_CHANNEL_HD_5 = 16; // 0x10
    field @FlaggedApi("android.hardware.radio.hd_radio_improved") public static final int SUB_CHANNEL_HD_6 = 32; // 0x20
    field @FlaggedApi("android.hardware.radio.hd_radio_improved") public static final int SUB_CHANNEL_HD_7 = 64; // 0x40
    field @FlaggedApi("android.hardware.radio.hd_radio_improved") public static final int SUB_CHANNEL_HD_8 = 128; // 0x80
    field public static final int SUB_CHANNEL_HD_1 = 1; // 0x1
    field public static final int SUB_CHANNEL_HD_2 = 2; // 0x2
    field public static final int SUB_CHANNEL_HD_3 = 4; // 0x4
    field public static final int SUB_CHANNEL_HD_4 = 8; // 0x8
    field public static final int SUB_CHANNEL_HD_5 = 16; // 0x10
    field public static final int SUB_CHANNEL_HD_6 = 32; // 0x20
    field public static final int SUB_CHANNEL_HD_7 = 64; // 0x40
    field public static final int SUB_CHANNEL_HD_8 = 128; // 0x80
  }
  public static final class ProgramSelector.Identifier implements android.os.Parcelable {
@@ -6789,8 +6789,8 @@ package android.hardware.radio {
    field public static final int CONFIG_DAB_FM_LINKING = 7; // 0x7
    field public static final int CONFIG_DAB_FM_SOFT_LINKING = 9; // 0x9
    field @Deprecated public static final int CONFIG_FORCE_ANALOG = 2; // 0x2
    field @FlaggedApi("android.hardware.radio.hd_radio_improved") public static final int CONFIG_FORCE_ANALOG_AM = 11; // 0xb
    field @FlaggedApi("android.hardware.radio.hd_radio_improved") public static final int CONFIG_FORCE_ANALOG_FM = 10; // 0xa
    field public static final int CONFIG_FORCE_ANALOG_AM = 11; // 0xb
    field public static final int CONFIG_FORCE_ANALOG_FM = 10; // 0xa
    field public static final int CONFIG_FORCE_DIGITAL = 3; // 0x3
    field public static final int CONFIG_FORCE_MONO = 1; // 0x1
    field public static final int CONFIG_RDS_AF = 4; // 0x4
@@ -6916,11 +6916,11 @@ package android.hardware.radio {
    method @Deprecated public int getSubChannel();
    method @NonNull public java.util.Map<java.lang.String,java.lang.String> getVendorInfo();
    method @Deprecated public boolean isDigital();
    method @FlaggedApi("android.hardware.radio.hd_radio_improved") public boolean isHdAudioAvailable();
    method @FlaggedApi("android.hardware.radio.hd_radio_improved") public boolean isHdSisAvailable();
    method public boolean isHdAudioAvailable();
    method public boolean isHdSisAvailable();
    method public boolean isLive();
    method public boolean isMuted();
    method @FlaggedApi("android.hardware.radio.hd_radio_improved") public boolean isSignalAcquired();
    method public boolean isSignalAcquired();
    method public boolean isStereo();
    method public boolean isTrafficAnnouncementActive();
    method public boolean isTrafficProgram();
@@ -6933,11 +6933,11 @@ package android.hardware.radio {
    method public boolean containsKey(String);
    method public int describeContents();
    method @Deprecated public android.graphics.Bitmap getBitmap(String);
    method @FlaggedApi("android.hardware.radio.hd_radio_improved") public int getBitmapId(@NonNull String);
    method public int getBitmapId(@NonNull String);
    method public android.hardware.radio.RadioMetadata.Clock getClock(String);
    method public int getInt(String);
    method public String getString(String);
    method @FlaggedApi("android.hardware.radio.hd_radio_improved") @NonNull public String[] getStringArray(@NonNull String);
    method @NonNull public String[] getStringArray(@NonNull String);
    method public java.util.Set<java.lang.String> keySet();
    method public int size();
    method public void writeToParcel(android.os.Parcel, int);
@@ -6946,9 +6946,9 @@ package android.hardware.radio {
    field public static final String METADATA_KEY_ART = "android.hardware.radio.metadata.ART";
    field public static final String METADATA_KEY_ARTIST = "android.hardware.radio.metadata.ARTIST";
    field public static final String METADATA_KEY_CLOCK = "android.hardware.radio.metadata.CLOCK";
    field @FlaggedApi("android.hardware.radio.hd_radio_improved") public static final String METADATA_KEY_COMMENT_ACTUAL_TEXT = "android.hardware.radio.metadata.COMMENT_ACTUAL_TEXT";
    field @FlaggedApi("android.hardware.radio.hd_radio_improved") public static final String METADATA_KEY_COMMENT_SHORT_DESCRIPTION = "android.hardware.radio.metadata.COMMENT_SHORT_DESCRIPTION";
    field @FlaggedApi("android.hardware.radio.hd_radio_improved") public static final String METADATA_KEY_COMMERCIAL = "android.hardware.radio.metadata.COMMERCIAL";
    field public static final String METADATA_KEY_COMMENT_ACTUAL_TEXT = "android.hardware.radio.metadata.COMMENT_ACTUAL_TEXT";
    field public static final String METADATA_KEY_COMMENT_SHORT_DESCRIPTION = "android.hardware.radio.metadata.COMMENT_SHORT_DESCRIPTION";
    field public static final String METADATA_KEY_COMMERCIAL = "android.hardware.radio.metadata.COMMERCIAL";
    field public static final String METADATA_KEY_DAB_COMPONENT_NAME = "android.hardware.radio.metadata.DAB_COMPONENT_NAME";
    field public static final String METADATA_KEY_DAB_COMPONENT_NAME_SHORT = "android.hardware.radio.metadata.DAB_COMPONENT_NAME_SHORT";
    field public static final String METADATA_KEY_DAB_ENSEMBLE_NAME = "android.hardware.radio.metadata.DAB_ENSEMBLE_NAME";
@@ -6956,9 +6956,9 @@ package android.hardware.radio {
    field public static final String METADATA_KEY_DAB_SERVICE_NAME = "android.hardware.radio.metadata.DAB_SERVICE_NAME";
    field public static final String METADATA_KEY_DAB_SERVICE_NAME_SHORT = "android.hardware.radio.metadata.DAB_SERVICE_NAME_SHORT";
    field public static final String METADATA_KEY_GENRE = "android.hardware.radio.metadata.GENRE";
    field @FlaggedApi("android.hardware.radio.hd_radio_improved") public static final String METADATA_KEY_HD_STATION_NAME_LONG = "android.hardware.radio.metadata.HD_STATION_NAME_LONG";
    field @FlaggedApi("android.hardware.radio.hd_radio_improved") public static final String METADATA_KEY_HD_STATION_NAME_SHORT = "android.hardware.radio.metadata.HD_STATION_NAME_SHORT";
    field @FlaggedApi("android.hardware.radio.hd_radio_improved") public static final String METADATA_KEY_HD_SUBCHANNELS_AVAILABLE = "android.hardware.radio.metadata.HD_SUBCHANNELS_AVAILABLE";
    field public static final String METADATA_KEY_HD_STATION_NAME_LONG = "android.hardware.radio.metadata.HD_STATION_NAME_LONG";
    field public static final String METADATA_KEY_HD_STATION_NAME_SHORT = "android.hardware.radio.metadata.HD_STATION_NAME_SHORT";
    field public static final String METADATA_KEY_HD_SUBCHANNELS_AVAILABLE = "android.hardware.radio.metadata.HD_SUBCHANNELS_AVAILABLE";
    field public static final String METADATA_KEY_ICON = "android.hardware.radio.metadata.ICON";
    field public static final String METADATA_KEY_PROGRAM_NAME = "android.hardware.radio.metadata.PROGRAM_NAME";
    field public static final String METADATA_KEY_RBDS_PTY = "android.hardware.radio.metadata.RBDS_PTY";
@@ -6967,7 +6967,7 @@ package android.hardware.radio {
    field public static final String METADATA_KEY_RDS_PTY = "android.hardware.radio.metadata.RDS_PTY";
    field public static final String METADATA_KEY_RDS_RT = "android.hardware.radio.metadata.RDS_RT";
    field public static final String METADATA_KEY_TITLE = "android.hardware.radio.metadata.TITLE";
    field @FlaggedApi("android.hardware.radio.hd_radio_improved") public static final String METADATA_KEY_UFIDS = "android.hardware.radio.metadata.UFIDS";
    field public static final String METADATA_KEY_UFIDS = "android.hardware.radio.metadata.UFIDS";
  }
  public static final class RadioMetadata.Builder {
@@ -6978,7 +6978,7 @@ package android.hardware.radio {
    method public android.hardware.radio.RadioMetadata.Builder putClock(String, long, int);
    method public android.hardware.radio.RadioMetadata.Builder putInt(String, int);
    method public android.hardware.radio.RadioMetadata.Builder putString(String, String);
    method @FlaggedApi("android.hardware.radio.hd_radio_improved") @NonNull public android.hardware.radio.RadioMetadata.Builder putStringArray(@NonNull String, @NonNull String[]);
    method @NonNull public android.hardware.radio.RadioMetadata.Builder putStringArray(@NonNull String, @NonNull String[]);
  }
  public static final class RadioMetadata.Clock implements android.os.Parcelable {
@@ -6997,7 +6997,7 @@ package android.hardware.radio {
    method @RequiresPermission(android.Manifest.permission.ACCESS_BROADCAST_RADIO) public abstract void close();
    method @Deprecated @RequiresPermission(android.Manifest.permission.ACCESS_BROADCAST_RADIO) public abstract int getConfiguration(android.hardware.radio.RadioManager.BandConfig[]);
    method @Nullable @RequiresPermission(android.Manifest.permission.ACCESS_BROADCAST_RADIO) public android.hardware.radio.ProgramList getDynamicProgramList(@Nullable android.hardware.radio.ProgramList.Filter);
    method @FlaggedApi("android.hardware.radio.hd_radio_improved") @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_BROADCAST_RADIO) public android.graphics.Bitmap getMetadataImage(int);
    method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_BROADCAST_RADIO) public android.graphics.Bitmap getMetadataImage(int);
    method @RequiresPermission(android.Manifest.permission.ACCESS_BROADCAST_RADIO) public abstract boolean getMute();
    method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_BROADCAST_RADIO) public java.util.Map<java.lang.String,java.lang.String> getParameters(@NonNull java.util.List<java.lang.String>);
    method @Deprecated @RequiresPermission(android.Manifest.permission.ACCESS_BROADCAST_RADIO) public abstract int getProgramInformation(android.hardware.radio.RadioManager.ProgramInfo[]);
+0 −2
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@
package android.hardware.radio;

import android.annotation.CallbackExecutor;
import android.annotation.FlaggedApi;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SystemApi;
@@ -329,7 +328,6 @@ public final class ProgramList implements AutoCloseable {
     * program identifier on the list
     * @throws NullPointerException if primary identifier is {@code null}
     */
    @FlaggedApi(Flags.FLAG_HD_RADIO_IMPROVED)
    public @NonNull List<RadioManager.ProgramInfo> getProgramInfos(
            @NonNull ProgramSelector.Identifier id) {
        Objects.requireNonNull(id, "Primary identifier can not be null");
+0 −10
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@

package android.hardware.radio;

import android.annotation.FlaggedApi;
import android.annotation.IntDef;
import android.annotation.IntRange;
import android.annotation.NonNull;
@@ -137,7 +136,6 @@ public final class ProgramSelector implements Parcelable {
     * converted to 0-based index. 0 is the index of main program service (MPS). 1 to 7 are
     * indexes of additional supplemental program services (SPS).
     */
    @FlaggedApi(Flags.FLAG_HD_RADIO_IMPROVED)
    public static final int SUB_CHANNEL_HD_1 = 1 << 0;

    /**
@@ -145,7 +143,6 @@ public final class ProgramSelector implements Parcelable {
     *
     * <p>For further reference, see {@link #SUB_CHANNEL_HD_1}
     */
    @FlaggedApi(Flags.FLAG_HD_RADIO_IMPROVED)
    public static final int SUB_CHANNEL_HD_2 = 1 << 1;

    /**
@@ -153,7 +150,6 @@ public final class ProgramSelector implements Parcelable {
     *
     * <p>For further reference, see {@link #SUB_CHANNEL_HD_1}
     */
    @FlaggedApi(Flags.FLAG_HD_RADIO_IMPROVED)
    public static final int SUB_CHANNEL_HD_3 = 1 << 2;

    /**
@@ -161,7 +157,6 @@ public final class ProgramSelector implements Parcelable {
     *
     * <p>For further reference, see {@link #SUB_CHANNEL_HD_1}
     */
    @FlaggedApi(Flags.FLAG_HD_RADIO_IMPROVED)
    public static final int SUB_CHANNEL_HD_4 = 1 << 3;

    /**
@@ -169,7 +164,6 @@ public final class ProgramSelector implements Parcelable {
     *
     * <p>For further reference, see {@link #SUB_CHANNEL_HD_1}
     */
    @FlaggedApi(Flags.FLAG_HD_RADIO_IMPROVED)
    public static final int SUB_CHANNEL_HD_5 = 1 << 4;

    /**
@@ -177,7 +171,6 @@ public final class ProgramSelector implements Parcelable {
     *
     * <p>For further reference, see {@link #SUB_CHANNEL_HD_1}
     */
    @FlaggedApi(Flags.FLAG_HD_RADIO_IMPROVED)
    public static final int SUB_CHANNEL_HD_6 = 1 << 5;

    /**
@@ -185,7 +178,6 @@ public final class ProgramSelector implements Parcelable {
     *
     * <p>For further reference, see {@link #SUB_CHANNEL_HD_1}
     */
    @FlaggedApi(Flags.FLAG_HD_RADIO_IMPROVED)
    public static final int SUB_CHANNEL_HD_7 = 1 << 6;

    /**
@@ -193,7 +185,6 @@ public final class ProgramSelector implements Parcelable {
     *
     * <p>For further reference, see {@link #SUB_CHANNEL_HD_1}
     */
    @FlaggedApi(Flags.FLAG_HD_RADIO_IMPROVED)
    public static final int SUB_CHANNEL_HD_8 = 1 << 7;

    /** @hide */
@@ -379,7 +370,6 @@ public final class ProgramSelector implements Parcelable {
     * carried as additional identifier and may be used by the tuner hardware
     * to double-check tuning.
     */
    @FlaggedApi(Flags.FLAG_HD_RADIO_IMPROVED)
    public static final int IDENTIFIER_TYPE_HD_STATION_LOCATION = 15;
    /**
     * Primary identifier for vendor-specific radio technology.
+0 −5
Original line number Diff line number Diff line
@@ -215,7 +215,6 @@ public class RadioManager {
     *
     * <p>Some radio technologies may not support this, i.e. DAB.
     */
    @FlaggedApi(Flags.FLAG_HD_RADIO_IMPROVED)
    public static final int CONFIG_FORCE_ANALOG_FM = 10;

    /**
@@ -227,7 +226,6 @@ public class RadioManager {
     *
     * <p>Some radio technologies may not support this, i.e. DAB.
     */
    @FlaggedApi(Flags.FLAG_HD_RADIO_IMPROVED)
    public static final int CONFIG_FORCE_ANALOG_AM = 11;

    /** @hide */
@@ -1752,21 +1750,18 @@ public class RadioManager {
        /**
         * @return {@code true} if the signal has been acquired.
         */
        @FlaggedApi(Flags.FLAG_HD_RADIO_IMPROVED)
        public boolean isSignalAcquired() {
            return (mInfoFlags & FLAG_SIGNAL_ACQUIRED) != 0;
        }
        /**
         * @return {@code true} if HD Station Information Service (SIS) information is available.
         */
        @FlaggedApi(Flags.FLAG_HD_RADIO_IMPROVED)
        public boolean isHdSisAvailable() {
            return (mInfoFlags & FLAG_HD_SIS_ACQUIRED) != 0;
        }
        /**
         * @return {@code true} if HD audio is available.
         */
        @FlaggedApi(Flags.FLAG_HD_RADIO_IMPROVED)
        public boolean isHdAudioAvailable() {
            return (mInfoFlags & FLAG_HD_AUDIO_ACQUIRED) != 0;
        }
+0 −11
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@
 */
package android.hardware.radio;

import android.annotation.FlaggedApi;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SystemApi;
@@ -152,7 +151,6 @@ public final class RadioMetadata implements Parcelable {
     * of short content description and actual text (see NRSC-G200-A and id3v2.3.0
     * for more info).
     */
    @FlaggedApi(Flags.FLAG_HD_RADIO_IMPROVED)
    public static final String METADATA_KEY_COMMENT_SHORT_DESCRIPTION =
            "android.hardware.radio.metadata.COMMENT_SHORT_DESCRIPTION";

@@ -161,7 +159,6 @@ public final class RadioMetadata implements Parcelable {
     *
     * @see #METADATA_KEY_COMMENT_SHORT_DESCRIPTION
     */
    @FlaggedApi(Flags.FLAG_HD_RADIO_IMPROVED)
    public static final String METADATA_KEY_COMMENT_ACTUAL_TEXT =
            "android.hardware.radio.metadata.COMMENT_ACTUAL_TEXT";

@@ -171,7 +168,6 @@ public final class RadioMetadata implements Parcelable {
     * <p>Commercial is application specific and generally used to facilitate the
     * sale of products and services (see NRSC-G200-A and id3v2.3.0 for more info).
     */
    @FlaggedApi(Flags.FLAG_HD_RADIO_IMPROVED)
    public static final String METADATA_KEY_COMMERCIAL =
            "android.hardware.radio.metadata.COMMERCIAL";

@@ -182,7 +178,6 @@ public final class RadioMetadata implements Parcelable {
     * identifier of the current content, or of an advertised product or
     * service (see NRSC-G200-A and id3v2.3.0 for more info).
     */
    @FlaggedApi(Flags.FLAG_HD_RADIO_IMPROVED)
    public static final String METADATA_KEY_UFIDS = "android.hardware.radio.metadata.UFIDS";

    /**
@@ -190,7 +185,6 @@ public final class RadioMetadata implements Parcelable {
     *
     * <p>It can be up to 12 characters (see SY_IDD_1020s for more info).
     */
    @FlaggedApi(Flags.FLAG_HD_RADIO_IMPROVED)
    public static final String METADATA_KEY_HD_STATION_NAME_SHORT =
            "android.hardware.radio.metadata.HD_STATION_NAME_SHORT";

@@ -199,7 +193,6 @@ public final class RadioMetadata implements Parcelable {
     *
     * <p>(see SY_IDD_1020s for more info)
     */
    @FlaggedApi(Flags.FLAG_HD_RADIO_IMPROVED)
    public static final String METADATA_KEY_HD_STATION_NAME_LONG =
            "android.hardware.radio.metadata.HD_STATION_NAME_LONG";

@@ -212,7 +205,6 @@ public final class RadioMetadata implements Parcelable {
     * from LSB represent HD-2 to HD-8 subchannel (supplemental program services, SPS)
     * respectively.
     */
    @FlaggedApi(Flags.FLAG_HD_RADIO_IMPROVED)
    public static final String METADATA_KEY_HD_SUBCHANNELS_AVAILABLE =
            "android.hardware.radio.metadata.HD_SUBCHANNELS_AVAILABLE";

@@ -509,7 +501,6 @@ public final class RadioMetadata implements Parcelable {
     * @throws IllegalArgumentException if the metadata with the key is not found in
     * metadata or the key is not of bitmap-key type
     */
    @FlaggedApi(Flags.FLAG_HD_RADIO_IMPROVED)
    public int getBitmapId(@NonNull String key) {
        Objects.requireNonNull(key, "Metadata key can not be null");
        if (!METADATA_KEY_ICON.equals(key) && !METADATA_KEY_ART.equals(key)) {
@@ -544,7 +535,6 @@ public final class RadioMetadata implements Parcelable {
     * @throws IllegalArgumentException if the metadata with the key is not found in
     * metadata or the key is not of string-array type
     */
    @FlaggedApi(Flags.FLAG_HD_RADIO_IMPROVED)
    @NonNull
    public String[] getStringArray(@NonNull String key) {
        Objects.requireNonNull(key, "Metadata key can not be null");
@@ -772,7 +762,6 @@ public final class RadioMetadata implements Parcelable {
         * @throws NullPointerException if key or value is null
         * @throws IllegalArgumentException if the key is not string-array-type key
         */
        @FlaggedApi(Flags.FLAG_HD_RADIO_IMPROVED)
        @NonNull
        public Builder putStringArray(@NonNull String key, @NonNull String[] value) {
            Objects.requireNonNull(key, "Key can not be null");
Loading