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

Commit 74a77919 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by Android (Google) Code Review
Browse files

Merge "Add DRMO_MODULATION program identifier type."

parents 71b257b5 ea0302a9

api/system-current.txt

+7 −6
Original line number Diff line number Diff line
@@ -17234,16 +17234,17 @@ package android.hardware.radio { 
    field public static final int IDENTIFIER_TYPE_DAB_SCID = 7; // 0x7

    field public static final int IDENTIFIER_TYPE_DAB_SIDECC = 5; // 0x5

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

    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 public static final int IDENTIFIER_TYPE_HD_SUBCHANNEL = 4; // 0x4

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

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

    field public static final int IDENTIFIER_TYPE_SXM_SERVICE_ID = 11; // 0xb

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

    field public static final int IDENTIFIER_TYPE_VENDOR2_PRIMARY = 14; // 0xe

    field public static final int IDENTIFIER_TYPE_VENDOR3_PRIMARY = 15; // 0xf

    field public static final int IDENTIFIER_TYPE_VENDOR4_PRIMARY = 16; // 0x10

    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_VENDOR1_PRIMARY = 14; // 0xe

    field public static final int IDENTIFIER_TYPE_VENDOR2_PRIMARY = 15; // 0xf

    field public static final int IDENTIFIER_TYPE_VENDOR3_PRIMARY = 16; // 0x10

    field public static final int IDENTIFIER_TYPE_VENDOR4_PRIMARY = 17; // 0x11

    field public static final int PROGRAM_TYPE_AM = 1; // 0x1

    field public static final int PROGRAM_TYPE_AM_HD = 3; // 0x3

    field public static final int PROGRAM_TYPE_DAB = 5; // 0x5

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

+9 −6
Original line number Diff line number Diff line
@@ -135,20 +135,22 @@ public final class ProgramSelector implements Parcelable { 
    public static final int IDENTIFIER_TYPE_DRMO_SERVICE_ID = 9;

    /** kHz */

    public static final int IDENTIFIER_TYPE_DRMO_FREQUENCY = 10;

    /** 1: AM, 2:FM */

    public static final int IDENTIFIER_TYPE_DRMO_MODULATION = 11;

    /** 32bit */

    public static final int IDENTIFIER_TYPE_SXM_SERVICE_ID = 11;

    public static final int IDENTIFIER_TYPE_SXM_SERVICE_ID = 12;

    /** 0-999 range */

    public static final int IDENTIFIER_TYPE_SXM_CHANNEL = 12;

    public static final int IDENTIFIER_TYPE_SXM_CHANNEL = 13;

    /**

     * Primary identifier for vendor-specific radio technology.

     * The value format is determined by a vendor.

     *

     * It must not be used in any other programType than VENDORx.

     */

    public static final int IDENTIFIER_TYPE_VENDOR1_PRIMARY = 13;

    public static final int IDENTIFIER_TYPE_VENDOR2_PRIMARY = 14;

    public static final int IDENTIFIER_TYPE_VENDOR3_PRIMARY = 15;

    public static final int IDENTIFIER_TYPE_VENDOR4_PRIMARY = 16;

    public static final int IDENTIFIER_TYPE_VENDOR1_PRIMARY = 14;

    public static final int IDENTIFIER_TYPE_VENDOR2_PRIMARY = 15;

    public static final int IDENTIFIER_TYPE_VENDOR3_PRIMARY = 16;

    public static final int IDENTIFIER_TYPE_VENDOR4_PRIMARY = 17;

    @IntDef(prefix = { "IDENTIFIER_TYPE_" }, value = {

        IDENTIFIER_TYPE_AMFM_FREQUENCY,

        IDENTIFIER_TYPE_RDS_PI,
@@ -160,6 +162,7 @@ public final class ProgramSelector implements Parcelable { 
        IDENTIFIER_TYPE_DAB_FREQUENCY,

        IDENTIFIER_TYPE_DRMO_SERVICE_ID,

        IDENTIFIER_TYPE_DRMO_FREQUENCY,

        IDENTIFIER_TYPE_DRMO_MODULATION,

        IDENTIFIER_TYPE_SXM_SERVICE_ID,

        IDENTIFIER_TYPE_SXM_CHANNEL,

        IDENTIFIER_TYPE_VENDOR1_PRIMARY,