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

Commit 8cd18f70 authored by Weilin Xu's avatar Weilin Xu
Browse files

Revert deprecated radio APIs 

Bug: 318362428
Test: atest CtsBroadcastRadioTestCases
Change-Id: I46d43e91b758209c843fce689662d2fffe5ff656
parent 48e74496

core/api/system-current.txt

+5 −5
Original line number Diff line number Diff line
@@ -5750,7 +5750,7 @@ package android.hardware.radio { 
    method public void addOnCompleteListener(@NonNull java.util.concurrent.Executor, @NonNull android.hardware.radio.ProgramList.OnCompleteListener);

    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 @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 public void registerListCallback(@NonNull java.util.concurrent.Executor, @NonNull android.hardware.radio.ProgramList.ListCallback);

    method public void registerListCallback(@NonNull android.hardware.radio.ProgramList.ListCallback);
@@ -5802,7 +5802,7 @@ package android.hardware.radio { 
    field @Deprecated public static final int IDENTIFIER_TYPE_DAB_SIDECC = 5; // 0x5

    field @Deprecated public static final int IDENTIFIER_TYPE_DAB_SID_EXT = 5; // 0x5

    field public static final int IDENTIFIER_TYPE_DRMO_FREQUENCY = 10; // 0xa

    field @Deprecated public static final int IDENTIFIER_TYPE_DRMO_MODULATION = 11; // 0xb

    field 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
@@ -5810,8 +5810,8 @@ package android.hardware.radio { 
    field @Deprecated public static final int IDENTIFIER_TYPE_HD_SUBCHANNEL = 4; // 0x4

    field public static final int IDENTIFIER_TYPE_INVALID = 0; // 0x0

    field public static final int IDENTIFIER_TYPE_RDS_PI = 2; // 0x2

    field @Deprecated public static final int IDENTIFIER_TYPE_SXM_CHANNEL = 13; // 0xd

    field @Deprecated public static final int IDENTIFIER_TYPE_SXM_SERVICE_ID = 12; // 0xc

    field public static final int IDENTIFIER_TYPE_SXM_CHANNEL = 13; // 0xd

    field public static final int IDENTIFIER_TYPE_SXM_SERVICE_ID = 12; // 0xc

    field public static final int IDENTIFIER_TYPE_VENDOR_END = 1999; // 0x7cf

    field @Deprecated public static final int IDENTIFIER_TYPE_VENDOR_PRIMARY_END = 1999; // 0x7cf

    field @Deprecated public static final int IDENTIFIER_TYPE_VENDOR_PRIMARY_START = 1000; // 0x3e8
@@ -5864,7 +5864,7 @@ package android.hardware.radio { 
    field public static final int CONFIG_DAB_DAB_SOFT_LINKING = 8; // 0x8

    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 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_DIGITAL = 3; // 0x3

core/java/android/hardware/radio/ProgramList.java

+0 −4
Original line number Diff line number Diff line
@@ -304,11 +304,7 @@ public final class ProgramList implements AutoCloseable { 
     *

     * @param id primary identifier of a program to fetch

     * @return the program info, or null if there is no such program on the list

     *

     * @deprecated Use {@link #getProgramInfos(ProgramSelector.Identifier)} to get all programs

     * with the given primary identifier

     */

    @Deprecated

    public @Nullable RadioManager.ProgramInfo get(@NonNull ProgramSelector.Identifier id) {

        Map<UniqueProgramIdentifier, RadioManager.ProgramInfo> entries;

        synchronized (mLock) {

core/java/android/hardware/radio/ProgramSelector.java

+0 −6
Original line number Diff line number Diff line
@@ -312,20 +312,14 @@ public final class ProgramSelector implements Parcelable { 
    public static final int IDENTIFIER_TYPE_DRMO_FREQUENCY = 10;

    /**

     * 1: AM, 2:FM

     * @deprecated use {@link #IDENTIFIER_TYPE_DRMO_FREQUENCY} instead

     */

    @Deprecated

    public static final int IDENTIFIER_TYPE_DRMO_MODULATION = 11;

    /**

     * 32bit primary identifier for SiriusXM Satellite Radio.

     *

     * @deprecated SiriusXM Satellite Radio is not supported

     */

    public static final int IDENTIFIER_TYPE_SXM_SERVICE_ID = 12;

    /**

     * 0-999 range

     *

     * @deprecated SiriusXM Satellite Radio is not supported

     */

    public static final int IDENTIFIER_TYPE_SXM_CHANNEL = 13;

    /**

core/java/android/hardware/radio/RadioManager.java

+0 −5
Original line number Diff line number Diff line
@@ -166,12 +166,7 @@ public class RadioManager { 
     * analog handover state managed from the HAL implementation side.

     *

     * <p>Some radio technologies may not support this, i.e. DAB.

     *

     * @deprecated Use {@link #CONFIG_FORCE_ANALOG_FM} instead. If {@link #CONFIG_FORCE_ANALOG_FM}

     * is supported in HAL, {@link RadioTuner#setConfigFlag} and {@link RadioTuner#isConfigFlagSet}

     * with CONFIG_FORCE_ANALOG will set/get the value of {@link #CONFIG_FORCE_ANALOG_FM}.

     */

    @Deprecated

    public static final int CONFIG_FORCE_ANALOG = 2;

    /**

     * Forces the digital playback for the supporting radio technology.