diff options
| -rw-r--r-- | api/system-current.txt | 13 | ||||
| -rw-r--r-- | core/java/android/hardware/radio/ProgramSelector.java | 15 |
2 files changed, 16 insertions, 12 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index bb12f7ca5199..c23e1e9d378b 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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 diff --git a/core/java/android/hardware/radio/ProgramSelector.java b/core/java/android/hardware/radio/ProgramSelector.java index 4638dd5dc950..d9e306f5194c 100644 --- a/core/java/android/hardware/radio/ProgramSelector.java +++ b/core/java/android/hardware/radio/ProgramSelector.java @@ -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, |