Merge "Use RadioConst to define undefined magic constants" into main

This commit is contained in:
Tomasz Wasilczyk
2024-11-07 20:44:58 +00:00
committed by Android (Google) Code Review
25 changed files with 127 additions and 108 deletions

View File

@@ -388,7 +388,7 @@
</hal>
<hal format="aidl">
<name>android.hardware.radio.config</name>
<version>3</version>
<version>3-4</version>
<interface>
<name>IRadioConfig</name>
<instance>default</instance>
@@ -406,7 +406,7 @@
</hal>
<hal format="aidl">
<name>android.hardware.radio.messaging</name>
<version>3</version>
<version>3-4</version>
<interface>
<name>IRadioMessaging</name>
<instance>slot1</instance>
@@ -416,7 +416,7 @@
</hal>
<hal format="aidl">
<name>android.hardware.radio.modem</name>
<version>3</version>
<version>3-4</version>
<interface>
<name>IRadioModem</name>
<instance>slot1</instance>
@@ -426,7 +426,7 @@
</hal>
<hal format="aidl">
<name>android.hardware.radio.network</name>
<version>3</version>
<version>3-4</version>
<interface>
<name>IRadioNetwork</name>
<instance>slot1</instance>
@@ -436,7 +436,7 @@
</hal>
<hal format="aidl">
<name>android.hardware.radio.sim</name>
<version>3</version>
<version>3-4</version>
<interface>
<name>IRadioSim</name>
<instance>slot1</instance>
@@ -456,7 +456,7 @@
</hal>
<hal format="aidl">
<name>android.hardware.radio.voice</name>
<version>3</version>
<version>3-4</version>
<interface>
<name>IRadioVoice</name>
<instance>slot1</instance>
@@ -466,7 +466,7 @@
</hal>
<hal format="aidl">
<name>android.hardware.radio.ims</name>
<version>2</version>
<version>2-3</version>
<interface>
<name>IRadioIms</name>
<instance>slot1</instance>

View File

@@ -37,7 +37,7 @@ aidl_interface {
},
],
frozen: true,
frozen: false,
}
@@ -47,7 +47,7 @@ aidl_interface {
host_supported: true,
srcs: ["android/hardware/radio/config/*.aidl"],
stability: "vintf",
imports: ["android.hardware.radio-V3"],
imports: ["android.hardware.radio-V4"],
backend: {
cpp: {
enabled: true,
@@ -71,7 +71,7 @@ aidl_interface {
},
],
frozen: true,
frozen: false,
}
@@ -81,7 +81,7 @@ aidl_interface {
host_supported: true,
srcs: ["android/hardware/radio/data/*.aidl"],
stability: "vintf",
imports: ["android.hardware.radio-V3"],
imports: ["android.hardware.radio-V4"],
backend: {
cpp: {
enabled: true,
@@ -114,7 +114,7 @@ aidl_interface {
host_supported: true,
srcs: ["android/hardware/radio/messaging/*.aidl"],
stability: "vintf",
imports: ["android.hardware.radio-V3"],
imports: ["android.hardware.radio-V4"],
backend: {
cpp: {
enabled: true,
@@ -138,7 +138,7 @@ aidl_interface {
},
],
frozen: true,
frozen: false,
}
aidl_interface {
@@ -147,7 +147,7 @@ aidl_interface {
host_supported: true,
srcs: ["android/hardware/radio/modem/*.aidl"],
stability: "vintf",
imports: ["android.hardware.radio-V3"],
imports: ["android.hardware.radio-V4"],
backend: {
cpp: {
enabled: true,
@@ -171,7 +171,7 @@ aidl_interface {
},
],
frozen: true,
frozen: false,
}
aidl_interface {
@@ -180,7 +180,7 @@ aidl_interface {
host_supported: true,
srcs: ["android/hardware/radio/network/*.aidl"],
stability: "vintf",
imports: ["android.hardware.radio-V3"],
imports: ["android.hardware.radio-V4"],
backend: {
cpp: {
enabled: true,
@@ -204,7 +204,7 @@ aidl_interface {
},
],
frozen: true,
frozen: false,
}
aidl_interface {
@@ -242,8 +242,8 @@ aidl_interface {
srcs: ["android/hardware/radio/sim/*.aidl"],
stability: "vintf",
imports: [
"android.hardware.radio-V3",
"android.hardware.radio.config-V3",
"android.hardware.radio-V4",
"android.hardware.radio.config-V4",
],
backend: {
cpp: {
@@ -277,7 +277,7 @@ aidl_interface {
},
],
frozen: true,
frozen: false,
}
aidl_interface {
@@ -286,7 +286,7 @@ aidl_interface {
host_supported: true,
srcs: ["android/hardware/radio/voice/*.aidl"],
stability: "vintf",
imports: ["android.hardware.radio-V3"],
imports: ["android.hardware.radio-V4"],
backend: {
cpp: {
enabled: true,
@@ -310,7 +310,7 @@ aidl_interface {
},
],
frozen: true,
frozen: false,
}
aidl_interface {
@@ -319,7 +319,7 @@ aidl_interface {
srcs: ["android/hardware/radio/ims/media/*.aidl"],
stability: "vintf",
imports: [
"android.hardware.radio-V3",
"android.hardware.radio-V4",
"android.hardware.radio.data-V4",
],
backend: {
@@ -355,7 +355,7 @@ aidl_interface {
vendor_available: true,
srcs: ["android/hardware/radio/ims/*.aidl"],
stability: "vintf",
imports: ["android.hardware.radio-V3"],
imports: ["android.hardware.radio-V4"],
backend: {
cpp: {
enabled: false,
@@ -375,5 +375,5 @@ aidl_interface {
},
],
frozen: true,
frozen: false,
}

View File

@@ -43,5 +43,5 @@ parcelable NrSignalStrength {
int csiSinr;
int csiCqiTableIndex;
byte[] csiCqiReport;
int timingAdvance = 0x7FFFFFFF;
int timingAdvance = android.hardware.radio.RadioConst.VALUE_UNAVAILABLE /* 2147483647 */;
}

View File

@@ -35,6 +35,9 @@ package android.hardware.radio;
/* @hide */
@JavaDerive(toString=true) @VintfStability
parcelable RadioConst {
const int VALUE_UNAVAILABLE = 0x7FFFFFFF;
const long VALUE_UNAVAILABLE_LONG = 0x7FFFFFFFFFFFFFFF;
const byte VALUE_UNAVAILABLE_BYTE = 0xFFu8;
const int MAX_RILDS = 3;
const int MAX_UUID_LENGTH = 64;
const int CARD_MAX_APPS = 8;

View File

@@ -20,6 +20,9 @@ package android.hardware.radio;
@VintfStability
@JavaDerive(toString=true)
parcelable RadioConst {
const int VALUE_UNAVAILABLE = 0x7FFFFFFF;
const long VALUE_UNAVAILABLE_LONG = 0x7FFFFFFFFFFFFFFF;
const byte VALUE_UNAVAILABLE_BYTE = 0xFFu8;
const int MAX_RILDS = 3;
const int MAX_UUID_LENGTH = 64;
const int CARD_MAX_APPS = 8;

View File

@@ -40,7 +40,7 @@ parcelable KeepaliveRequest {
byte[] sourceAddress;
/**
* Source port if relevant for the given type
* INT_MAX: 0x7FFFFFFF denotes that the field is unused
* RadioConst:VALUE_UNAVAILABLE denotes that the field is unused
*/
int sourcePort;
/**
@@ -49,7 +49,7 @@ parcelable KeepaliveRequest {
byte[] destinationAddress;
/**
* Destination if relevant for the given type
* INT_MAX: 0x7FFFFFFF denotes that the field is unused
* RadioConst:VALUE_UNAVAILABLE denotes that the field is unused
*/
int destinationPort;
/**

View File

@@ -44,14 +44,14 @@ parcelable LinkAddress {
* The time, as reported by SystemClock.elapsedRealtime(), when this link address will be or
* was deprecated. -1 indicates this information is not available. At the time existing
* connections can still use this address until it expires, but new connections should use the
* new address. LONG_MAX(0x7FFFFFFFFFFFFFFF) indicates this link address will never be
* new address. RadioConst:VALUE_UNAVAILABLE_LONG indicates this link address will never be
* deprecated.
*/
long deprecationTime;
/**
* The time, as reported by SystemClock.elapsedRealtime(), when this link address will expire
* and be removed from the interface. -1 indicates this information is not available.
* LONG_MAX(0x7FFFFFFFFFFFFFFF) indicates this link address will never expire.
* RadioConst:VALUE_UNAVAILABLE_LONG indicates this link address will never expire.
*/
long expirationTime;
}

View File

@@ -68,10 +68,10 @@ parcelable SetupDataCallResult {
/**
* If cause is not DataCallFailCause.NONE, this field indicates the network suggested data
* retry back-off time in milliseconds. Negative value indicates network does not give any
* suggestion. 0 indicates retry should be performed immediately. 0x7fffffffffffffff indicates
* the device should not retry data setup anymore. During this time, no calls to
* IRadioData.setupDataCall for this APN will be made unless IRadioDataIndication.unthrottleApn
* is sent with the same APN.
* suggestion. 0 indicates retry should be performed immediately.
* RadioConst:VALUE_UNAVAILABLE_LONG indicates the device should not retry data setup anymore.
* During this time, no calls to IRadioData.setupDataCall for this APN will be made unless
* IRadioDataIndication.unthrottleApn is sent with the same APN.
*/
long suggestedRetryTime;
/**

View File

@@ -22,12 +22,12 @@ package android.hardware.radio.network;
parcelable CdmaSignalStrength {
/**
* This value is the actual RSSI value multiplied by -1. Example: If the actual RSSI is -75,
* then this response value will be 75. INT_MAX means invalid/unreported.
* then this response value will be 75. RadioConst:VALUE_UNAVAILABLE means invalid/unreported.
*/
int dbm;
/**
* This value is the actual Ec/Io multiplied by -10. Example: If the actual Ec/Io is -12.5 dB,
* then this response value will be 125. INT_MAX means invalid/unreported.
* then this response value will be 125. RadioConst:VALUE_UNAVAILABLE means invalid/unreported.
*/
int ecio;
}

View File

@@ -23,27 +23,27 @@ import android.hardware.radio.network.OperatorInfo;
@JavaDerive(toString=true)
parcelable CellIdentityCdma {
/**
* Network Id 0..65535, INT_MAX if unknown
* Network Id 0..65535, RadioConst:VALUE_UNAVAILABLE if unknown
*/
int networkId;
/**
* CDMA System Id 0..32767, INT_MAX if unknown
* CDMA System Id 0..32767, RadioConst:VALUE_UNAVAILABLE if unknown
*/
int systemId;
/**
* Base Station Id 0..65535, INT_MAX if unknown
* Base Station Id 0..65535, RadioConst:VALUE_UNAVAILABLE if unknown
*/
int baseStationId;
/**
* Longitude is a decimal number as specified in 3GPP2 C.S0005-A v6.0. It is represented in
* units of 0.25 seconds and ranges from -2592000 to 2592000, both values inclusive
* (corresponding to a range of -180 to +180 degrees). INT_MAX if unknown
* (corresponding to a range of -180 to +180 degrees). RadioConst:VALUE_UNAVAILABLE if unknown
*/
int longitude;
/**
* Latitude is a decimal number as specified in 3GPP2 C.S0005-A v6.0. It is represented in
* units of 0.25 seconds and ranges from -1296000 to 1296000, both values inclusive
* (corresponding to a range of -90 to +90 degrees). INT_MAX if unknown
* (corresponding to a range of -90 to +90 degrees). RadioConst:VALUE_UNAVAILABLE if unknown
*/
int latitude;
/**

View File

@@ -31,11 +31,12 @@ parcelable CellIdentityGsm {
*/
String mnc;
/**
* 16-bit Location Area Code, 0..65535, INT_MAX if unknown
* 16-bit Location Area Code, 0..65535, RadioConst:VALUE_UNAVAILABLE if unknown
*/
int lac;
/**
* 16-bit GSM Cell Identity described in TS 27.007, 0..65535, INT_MAX if unknown
* 16-bit GSM Cell Identity described in TS 27.007, 0..65535,
* RadioConst:VALUE_UNAVAILABLE if unknown
*/
int cid;
/**
@@ -43,7 +44,7 @@ parcelable CellIdentityGsm {
*/
int arfcn;
/**
* 6-bit Base Station Identity Code, 0xFF if unknown
* 6-bit Base Station Identity Code, RadioConst:VALUE_UNAVAILABLE_BYTE if unknown
*/
byte bsic;
/**

View File

@@ -33,7 +33,7 @@ parcelable CellIdentityLte {
*/
String mnc;
/**
* 28-bit Cell Identity described in TS 27.007, INT_MAX if unknown
* 28-bit Cell Identity described in TS 27.007, RadioConst:VALUE_UNAVAILABLE if unknown
*/
int ci;
/**
@@ -41,7 +41,7 @@ parcelable CellIdentityLte {
*/
int pci;
/**
* 16-bit tracking area code, INT_MAX if unknown
* 16-bit tracking area code, RadioConst:VALUE_UNAVAILABLE if unknown
*/
int tac;
/**

View File

@@ -29,12 +29,12 @@ import android.hardware.radio.network.OperatorInfo;
parcelable CellIdentityNr {
/**
* 3-digit Mobile Country Code, in range[0, 999]; This value must be valid for registered or
* camped cells; INT_MAX means invalid/unreported.
* camped cells; Empty string means invalid/unreported.
*/
String mcc;
/**
* 2 or 3-digit Mobile Network Code, in range [0, 999], This value must be valid for
* registered or camped cells; INT_MAX means invalid/unreported.
* registered or camped cells; Empty string means invalid/unreported.
*/
String mnc;
/**
@@ -48,7 +48,7 @@ parcelable CellIdentityNr {
*/
int pci;
/**
* 16-bit tracking area code, INT_MAX means invalid/unreported.
* 16-bit tracking area code, RadioConst:VALUE_UNAVAILABLE means invalid/unreported.
*/
int tac;
/**

View File

@@ -32,15 +32,17 @@ parcelable CellIdentityTdscdma {
*/
String mnc;
/**
* 16-bit Location Area Code, 0..65535, INT_MAX if unknown.
* 16-bit Location Area Code, 0..65535, RadioConst:VALUE_UNAVAILABLE if unknown.
*/
int lac;
/**
* 28-bit UMTS Cell Identity described in TS 25.331, 0..268435455, INT_MAX if unknown.
* 28-bit UMTS Cell Identity described in TS 25.331, 0..268435455, RadioConst:VALUE_UNAVAILABLE
* if unknown.
*/
int cid;
/**
* 8-bit Cell Parameters ID described in TS 25.331, 0..127, INT_MAX if unknown.
* 8-bit Cell Parameters ID described in TS 25.331, 0..127, RadioConst:VALUE_UNAVAILABLE if
* unknown.
*/
int cpid;
/**

View File

@@ -32,11 +32,12 @@ parcelable CellIdentityWcdma {
*/
String mnc;
/**
* 16-bit Location Area Code, 0..65535, INT_MAX if unknown.
* 16-bit Location Area Code, 0..65535, RadioConst:VALUE_UNAVAILABLE if unknown.
*/
int lac;
/**
* 28-bit UMTS Cell Identity described in TS 25.331, 0..268435455, INT_MAX if unknown.
* 28-bit UMTS Cell Identity described in TS 25.331, 0..268435455, RadioConst:VALUE_UNAVAILABLE
* if unknown.
*/
int cid;
/**

View File

@@ -22,17 +22,17 @@ package android.hardware.radio.network;
parcelable EvdoSignalStrength {
/**
* This value is the actual RSSI value multiplied by -1. Example: If the actual RSSI is -75,
* then this response value will be 75; INT_MAX means invalid/unreported.
* then this response value will be 75; RadioConst:VALUE_UNAVAILABLE means invalid/unreported.
*/
int dbm;
/**
* This value is the actual Ec/Io multiplied by -10. Example: If the actual Ec/Io is -12.5 dB,
* then this response value will be 125; INT_MAX means invalid/unreported.
* then this response value will be 125; RadioConst:VALUE_UNAVAILABLE means invalid/unreported.
*/
int ecio;
/**
* Valid values are 0-8. 8 is the highest signal to noise ratio; INT_MAX means
* invalid/unreported.
* Valid values are 0-8. 8 is the highest signal to noise ratio; RadioConst:VALUE_UNAVAILABLE
* means invalid/unreported.
*/
int signalNoiseRatio;
}

View File

@@ -21,15 +21,18 @@ package android.hardware.radio.network;
@JavaDerive(toString=true)
parcelable GsmSignalStrength {
/**
* Valid values are (0-61, 99) as defined in TS 27.007 8.69; INT_MAX means invalid/unreported.
* Valid values are (0-61, 99) as defined in TS 27.007 8.69; RadioConst:VALUE_UNAVAILABLE means
* invalid/unreported.
*/
int signalStrength;
/**
* Bit error rate (0-7, 99) as defined in TS 27.007 8.5; INT_MAX means invalid/unreported.
* Bit error rate (0-7, 99) as defined in TS 27.007 8.5; RadioConst:VALUE_UNAVAILABLE means
* invalid/unreported.
*/
int bitErrorRate;
/**
* Timing advance in bit periods. 1 bit period = 48/13 us. INT_MAX means invalid/unreported.
* Timing advance in bit periods. 1 bit period = 48/13 us. RadioConst:VALUE_UNAVAILABLE means
* invalid/unreported.
*/
int timingAdvance;
}

View File

@@ -278,7 +278,7 @@ oneway interface IRadioNetwork {
/**
* Sets the minimum time between when unsolicited cellInfoList() must be invoked.
* A value of 0, means invoke cellInfoList() when any of the reported information changes.
* Setting the value to INT_MAX(0x7fffffff) means never issue a unsolicited cellInfoList().
* Value of RadioConst:VALUE_UNAVAILABLE means never issue a unsolicited cellInfoList().
*
* @param serial Serial number of request.
* @param rate minimum time in milliseconds to indicate time between unsolicited cellInfoList()

View File

@@ -21,41 +21,43 @@ package android.hardware.radio.network;
@JavaDerive(toString=true)
parcelable LteSignalStrength {
/**
* Valid values are (0-31, 99) as defined in TS 27.007 8.5; INT_MAX means invalid/unreported.
* Valid values are (0-31, 99) as defined in TS 27.007 8.5;
* RadioConst:VALUE_UNAVAILABLE means invalid/unreported.
*/
int signalStrength;
/**
* The current Reference Signal Receive Power in dBm multiplied by -1. Range: 44 to 140 dBm;
* INT_MAX: 0x7FFFFFFF denotes invalid/unreported value. Reference: 3GPP TS 36.133 9.1.4
* RadioConst:VALUE_UNAVAILABLE denotes invalid/unreported value. Ref: 3GPP TS 36.133 9.1.4
*/
int rsrp;
/**
* The current Reference Signal Receive Quality in dB multiplied by -1. Range: 20 to 3 dB;
* INT_MAX: 0x7FFFFFFF denotes invalid/unreported value. Reference: 3GPP TS 36.133 9.1.7
* RadioConst:VALUE_UNAVAILABLE denotes invalid/unreported value. Ref: 3GPP TS 36.133 9.1.7
*/
int rsrq;
/**
* The current reference signal signal-to-noise ratio in 0.1 dB units.
* Range: -200 to +300 (-200 = -20.0 dB, +300 = 30dB).
* INT_MAX: 0x7FFFFFFF denotes invalid/unreported value. Reference: 3GPP TS 36.101 8.1.1
* RadioConst:VALUE_UNAVAILABLE denotes invalid/unreported value. Ref: 3GPP TS 36.101 8.1.1
*/
int rssnr;
/**
* The current Channel Quality Indicator. Range: 0 to 15.
* INT_MAX: 0x7FFFFFFF denotes invalid/unreported value. Reference: 3GPP TS 36.101 9.2, 9.3, A.4
* RadioConst:VALUE_UNAVAILABLE denotes invalid/unreported value.
* Ref: 3GPP TS 36.101 9.2, 9.3, A.4
*/
int cqi;
/**
* Timing advance in micro seconds for a one way trip from cell to device. Approximate distance
* is calculated using 300m/us * timingAdvance. Range: 0 to 1282 inclusive.
* INT_MAX: 0x7FFFFFFF denotes invalid/unreported value. Reference: 3GPP 36.213 section 4.2.3
* RadioConst:VALUE_UNAVAILABLE denotes invalid/unreported value. Ref: 3GPP 36.213 section 4.2.3
*/
int timingAdvance;
/**
* CSI channel quality indicator (CQI) table index. There are multiple CQI tables.
* The definition of CQI in each table is different.
* Reference: 3GPP TS 136.213 section 7.2.3.
* Range [1, 6], INT_MAX means invalid/unreported.
* Range [1, 6], RadioConst:VALUE_UNAVAILABLE means invalid/unreported.
*/
int cqiTableIndex;
}

View File

@@ -16,6 +16,8 @@
package android.hardware.radio.network;
import android.hardware.radio.RadioConst;
/** @hide */
@VintfStability
@JavaDerive(toString=true)
@@ -23,44 +25,44 @@ parcelable NrSignalStrength {
/**
* SS reference signal received power, multiplied by -1.
* Reference: 3GPP TS 38.215.
* Range [44, 140], INT_MAX means invalid/unreported.
* Range [44, 140], RadioConst:VALUE_UNAVAILABLE means invalid/unreported.
*/
int ssRsrp;
/**
* SS reference signal received quality, multiplied by -1.
* Reference: 3GPP TS 38.215, 3GPP TS 38.133 section 10.
* Range [-20 dB, 43 dB], INT_MAX means invalid/unreported.
* Range [-20 dB, 43 dB], RadioConst:VALUE_UNAVAILABLE means invalid/unreported.
*/
int ssRsrq;
/**
* SS signal-to-noise and interference ratio.
* Reference: 3GPP TS 38.215 section 5.1.*, 3GPP TS 38.133 section 10.1.16.1.
* Range [-23, 40], INT_MAX means invalid/unreported.
* Range [-23, 40], RadioConst:VALUE_UNAVAILABLE means invalid/unreported.
*/
int ssSinr;
/**
* CSI reference signal received power, multiplied by -1.
* Reference: 3GPP TS 38.215.
* Range [44, 140], INT_MAX means invalid/unreported.
* Range [44, 140], RadioConst:VALUE_UNAVAILABLE means invalid/unreported.
*/
int csiRsrp;
/**
* CSI reference signal received quality, multiplied by -1.
* Reference: 3GPP TS 38.215.
* Range [3, 20], INT_MAX means invalid/unreported.
* Range [3, 20], RadioConst:VALUE_UNAVAILABLE means invalid/unreported.
*/
int csiRsrq;
/**
* CSI signal-to-noise and interference ratio.
* Reference: 3GPP TS 138.215 section 5.1.*, 3GPP TS 38.133 section 10.1.16.1.
* Range [-23, 40], INT_MAX means invalid/unreported.
* Range [-23, 40], RadioConst:VALUE_UNAVAILABLE means invalid/unreported.
*/
int csiSinr;
/**
* CSI channel quality indicator (CQI) table index. There are multiple CQI tables.
* The definition of CQI in each table is different.
* Reference: 3GPP TS 138.214 section 5.2.2.1.
* Range [1, 3], INT_MAX means invalid/unreported.
* Range [1, 3], RadioConst:VALUE_UNAVAILABLE means invalid/unreported.
*/
int csiCqiTableIndex;
/**
@@ -69,14 +71,14 @@ parcelable NrSignalStrength {
* index is provided for each subband, in ascending order of subband index. If CQI is not
* available, the CQI report is empty.
* Reference: 3GPP TS 138.214 section 5.2.2.1.
* Range [0, 15], 0xFF means invalid/unreported.
* Range [0, 15], RadioConst:VALUE_UNAVAILABLE_BYTE means invalid/unreported.
*/
byte[] csiCqiReport;
/**
* Timing advance in micro seconds for a one way trip from cell to device. Approximate distance
* is calculated using 300m/us * timingAdvance. Range: 0 to 1282 inclusive.
* INT_MAX: 0x7FFFFFFF denotes invalid/unreported value.
* RadioConst:VALUE_UNAVAILABLE denotes invalid/unreported value.
* Reference: 3GPP 36.213 section 4.2.3
*/
int timingAdvance = 0x7FFFFFFF;
int timingAdvance = RadioConst.VALUE_UNAVAILABLE;
}

View File

@@ -30,37 +30,37 @@ import android.hardware.radio.network.WcdmaSignalStrength;
parcelable SignalStrength {
/**
* If GSM measurements are provided, this structure must contain valid measurements; otherwise
* all fields should be set to INT_MAX to mark them as invalid.
* all fields should be set to RadioConst:VALUE_UNAVAILABLE to mark them as invalid.
*/
GsmSignalStrength gsm;
/**
* If CDMA measurements are provided, this structure must contain valid measurements; otherwise
* all fields should be set to INT_MAX to mark them as invalid.
* all fields should be set to RadioConst:VALUE_UNAVAILABLE to mark them as invalid.
*/
CdmaSignalStrength cdma;
/**
* If EvDO measurements are provided, this structure must contain valid measurements; otherwise
* all fields should be set to INT_MAX to mark them as invalid.
* all fields should be set to RadioConst:VALUE_UNAVAILABLE to mark them as invalid.
*/
EvdoSignalStrength evdo;
/**
* If LTE measurements are provided, this structure must contain valid measurements; otherwise
* all fields should be set to INT_MAX to mark them as invalid.
* all fields should be set to RadioConst:VALUE_UNAVAILABLE to mark them as invalid.
*/
LteSignalStrength lte;
/**
* If TD-SCDMA measurements are provided, this structure must contain valid measurements;
* otherwise all fields should be set to INT_MAX to mark them as invalid.
* otherwise all fields should be set to RadioConst:VALUE_UNAVAILABLE to mark them as invalid.
*/
TdscdmaSignalStrength tdscdma;
/**
* If WCDMA measurements are provided, this structure must contain valid measurements; otherwise
* all fields should be set to INT_MAX to mark them as invalid.
* all fields should be set to RadioConst:VALUE_UNAVAILABLE to mark them as invalid.
*/
WcdmaSignalStrength wcdma;
/**
* If NR 5G measurements are provided, this structure must contain valid measurements; otherwise
* all fields should be set to INT_MAX to mark them as invalid.
* all fields should be set to RadioConst:VALUE_UNAVAILABLE to mark them as invalid.
*/
NrSignalStrength nr;
}

View File

@@ -22,17 +22,17 @@ package android.hardware.radio.network;
parcelable TdscdmaSignalStrength {
/**
* UTRA carrier RSSI as defined in TS 25.225 5.1.4. Valid values are (0-31, 99) as defined in
* TS 27.007 8.5. INT_MAX denotes that the value is invalid/unreported.
* TS 27.007 8.5. RadioConst:VALUE_UNAVAILABLE denotes that the value is invalid/unreported.
*/
int signalStrength;
/**
* Transport Channel BER as defined in TS 25.225 5.2.5. Valid values are (0-7, 99) as defined in
* TS 27.007 8.5. INT_MAX denotes that the value is invalid/unreported.
* TS 27.007 8.5. RadioConst:VALUE_UNAVAILABLE denotes that the value is invalid/unreported.
*/
int bitErrorRate;
/**
* P-CCPCH RSCP as defined in TS 25.225 5.1.1. Valid values are (0-96, 255) as defined in
* TS 27.007 8.69. INT_MAX denotes that the value is invalid/unreported.
* TS 27.007 8.69. RadioConst:VALUE_UNAVAILABLE denotes that the value is invalid/unreported.
*/
int rscp;
}

View File

@@ -21,21 +21,23 @@ package android.hardware.radio.network;
@JavaDerive(toString=true)
parcelable WcdmaSignalStrength {
/**
* Valid values are (0-31, 99) as defined in TS 27.007 8.5; INT_MAX means unreported.
* Valid values are (0-31, 99) as defined in TS 27.007 8.5; RadioConst:VALUE_UNAVAILABLE means
* unreported.
*/
int signalStrength;
/**
* Bit error rate (0-7, 99) as defined in TS 27.007 8.5; INT_MAX means invalid/unreported.
* Bit error rate (0-7, 99) as defined in TS 27.007 8.5; RadioConst:VALUE_UNAVAILABLE means
* invalid/unreported.
*/
int bitErrorRate;
/**
* CPICH RSCP as defined in TS 25.215 5.1.1. Valid values are (0-96, 255) as defined in
* TS 27.007 8.69. INT_MAX denotes that the value is invalid/unreported.
* TS 27.007 8.69. RadioConst:VALUE_UNAVAILABLE denotes that the value is invalid/unreported.
*/
int rscp;
/**
* Ec/No value as defined in TS 25.215 5.1.5. Valid values are (0-49, 255) as defined in
* TS 27.007 8.69. INT_MAX denotes that the value is invalid/unreported.
* TS 27.007 8.69. RadioConst:VALUE_UNAVAILABLE denotes that the value is invalid/unreported.
*/
int ecno;
}

View File

@@ -25,16 +25,16 @@ package {
cc_defaults {
name: "android.hardware.radio-library.aidl_deps",
shared_libs: [
"android.hardware.radio.config-V3-ndk",
"android.hardware.radio.config-V4-ndk",
"android.hardware.radio.data-V4-ndk",
"android.hardware.radio.ims-V2-ndk",
"android.hardware.radio.ims-V3-ndk",
"android.hardware.radio.ims.media-V3-ndk",
"android.hardware.radio.messaging-V3-ndk",
"android.hardware.radio.modem-V3-ndk",
"android.hardware.radio.network-V3-ndk",
"android.hardware.radio.messaging-V4-ndk",
"android.hardware.radio.modem-V4-ndk",
"android.hardware.radio.network-V4-ndk",
"android.hardware.radio.sap-V1-ndk",
"android.hardware.radio.sim-V3-ndk",
"android.hardware.radio.voice-V3-ndk",
"android.hardware.radio.sim-V4-ndk",
"android.hardware.radio.voice-V4-ndk",
],
}

View File

@@ -77,17 +77,17 @@ cc_test {
"server_configurable_flags",
],
static_libs: [
"android.hardware.radio-V3-ndk",
"android.hardware.radio.config-V3-ndk",
"android.hardware.radio-V4-ndk",
"android.hardware.radio.config-V4-ndk",
"android.hardware.radio.data-V4-ndk",
"android.hardware.radio.ims-V2-ndk",
"android.hardware.radio.ims-V3-ndk",
"android.hardware.radio.ims.media-V3-ndk",
"android.hardware.radio.messaging-V3-ndk",
"android.hardware.radio.modem-V3-ndk",
"android.hardware.radio.network-V3-ndk",
"android.hardware.radio.messaging-V4-ndk",
"android.hardware.radio.modem-V4-ndk",
"android.hardware.radio.network-V4-ndk",
"android.hardware.radio.sap-V1-ndk",
"android.hardware.radio.sim-V3-ndk",
"android.hardware.radio.voice-V3-ndk",
"android.hardware.radio.sim-V4-ndk",
"android.hardware.radio.voice-V4-ndk",
"telephony_flags_c_lib",
],
test_suites: [