Merge "Fixes to Align TdScdma Reports with All Others" am: 38dcd0c535

am: ff3eff3386

Change-Id: Iac37c78e2a00df15a9157da2cb2dc8aae60b6f0e
This commit is contained in:
nharold 2018-02-16 00:49:25 +00:00 committed by android-build-merger
commit 4ce247b6ff
3 changed files with 38 additions and 2 deletions

View file

@ -28,11 +28,13 @@ hidl_interface {
"CellIdentityGsm",
"CellIdentityLte",
"CellIdentityOperatorNames",
"CellIdentityTdscdma",
"CellIdentityWcdma",
"CellInfo",
"CellInfoCdma",
"CellInfoGsm",
"CellInfoLte",
"CellInfoTdscdma",
"CellInfoWcdma",
"DataRequestReason",
"IncrementalResultsPeriodicityRange",
@ -45,6 +47,7 @@ hidl_interface {
"RadioConst",
"ScanIntervalRange",
"SignalStrength",
"TdscdmaSignalStrength",
"WcdmaSignalStrength",
],
gen_java: true,

View file

@ -90,12 +90,12 @@ interface IRadioResponse extends @1.1::IRadioResponse {
oneway getCurrentCallsResponse_1_2(RadioResponseInfo info, vec<Call> calls);
/**
* @param sigStrength Current signal strength
* @param signalStrength Current signal strength
*
* Valid errors returned:
* RadioError:NONE
* RadioError:RADIO_NOT_AVAILABLE
* RadioError:INTERNAL_ERR
*/
oneway getSignalStrengthResponse_1_2(RadioResponseInfo info, SignalStrength sigStrength);
oneway getSignalStrengthResponse_1_2(RadioResponseInfo info, SignalStrength signalStrength);
};

View file

@ -23,6 +23,7 @@ import @1.0::CdmaSignalStrength;
import @1.0::CellIdentityCdma;
import @1.0::CellIdentityGsm;
import @1.0::CellIdentityLte;
import @1.0::CellIdentityTdscdma;
import @1.0::CellIdentityWcdma;
import @1.0::CellInfoTdscdma;
import @1.0::CellInfoType;
@ -253,6 +254,15 @@ struct CellIdentityLte {
int32_t bandwidth;
};
struct CellIdentityTdscdma {
@1.0::CellIdentityTdscdma base;
/**
* 16-bit UMTS Absolute RF Channel Number defined in TS 25.102 5.4.4; this value must be valid.
*/
int32_t uarfcn;
CellIdentityOperatorNames operatorNames;
};
struct CellIdentityWcdma {
@1.0::CellIdentityWcdma base;
CellIdentityOperatorNames operatorNames;
@ -279,6 +289,11 @@ struct CellInfoLte {
LteSignalStrength signalStrengthLte;
};
struct CellInfoTdscdma {
CellIdentityTdscdma cellIdentityTdscdma;
TdscdmaSignalStrength signalStrengthTdscdma;
};
struct CellInfo {
/**
* Cell type for selecting from union CellInfo.
@ -415,6 +430,24 @@ struct WcdmaSignalStrength {
};
struct TdscdmaSignalStrength {
/**
* UTRA carrier RSSI as defined in TS 25.225 5.1.4
* Valid values are (0-96, 99) as defined in TS 27.007 8.69
*/
uint32_t signalStrength;
/**
* Transport Channel BER as defined in TS 25.225 5.2.5
* Valid values are (0-49, 99) as defined in TS 27.007 8.69
*/
uint32_t 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
*/
uint32_t rscp;
};
struct SignalStrength {
GsmSignalStrength gsm;
CdmaSignalStrength cdma;