diff options
| author | Wink Saville <wink@google.com> | 2013-04-17 12:51:41 -0700 |
|---|---|---|
| committer | Wink Saville <wink@google.com> | 2013-04-17 12:51:41 -0700 |
| commit | c57b3eb525db241bd3e6092453f48388bc880447 (patch) | |
| tree | e204eef9b1a1dbb971e98c53bcb70e458a94c968 /libril | |
| parent | 526882652bc7f97dfbdbf33f1a5966b1f05fbacf (diff) | |
| download | android_hardware_ril-c57b3eb525db241bd3e6092453f48388bc880447.tar.gz android_hardware_ril-c57b3eb525db241bd3e6092453f48388bc880447.tar.bz2 android_hardware_ril-c57b3eb525db241bd3e6092453f48388bc880447.zip | |
Add CellInfoWcdma.
Update CellIdentityXxx docs to define unknown values as INT_MAX.
Bug: 8622081
Change-Id: I513a67d4b46b72f03e0c3360abcc0ad5222c1c13
Diffstat (limited to 'libril')
| -rw-r--r-- | libril/ril.cpp | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/libril/ril.cpp b/libril/ril.cpp index 4d96988..e1877a1 100644 --- a/libril/ril.cpp +++ b/libril/ril.cpp @@ -2214,13 +2214,12 @@ static int responseCellInfoList(Parcel &p, void *response, size_t responselen) p.writeInt64(p_cur->timeStamp); switch(p_cur->cellInfoType) { case RIL_CELL_INFO_TYPE_GSM: { - appendPrintBuf("%s GSM id: mcc=%d,mnc=%d,lac=%d,cid=%d,psc=%d,", printBuf, + appendPrintBuf("%s GSM id: mcc=%d,mnc=%d,lac=%d,cid=%d,", printBuf, p_cur->CellInfo.gsm.cellIdentityGsm.mcc, p_cur->CellInfo.gsm.cellIdentityGsm.mnc, p_cur->CellInfo.gsm.cellIdentityGsm.lac, - p_cur->CellInfo.gsm.cellIdentityGsm.cid, - p_cur->CellInfo.gsm.cellIdentityGsm.psc); - appendPrintBuf("%s SS: gsmSS ss=%d,ber=%d],", printBuf, + p_cur->CellInfo.gsm.cellIdentityGsm.cid); + appendPrintBuf("%s gsmSS: ss=%d,ber=%d],", printBuf, p_cur->CellInfo.gsm.signalStrengthGsm.signalStrength, p_cur->CellInfo.gsm.signalStrengthGsm.bitErrorRate); @@ -2228,11 +2227,30 @@ static int responseCellInfoList(Parcel &p, void *response, size_t responselen) p.writeInt32(p_cur->CellInfo.gsm.cellIdentityGsm.mnc); p.writeInt32(p_cur->CellInfo.gsm.cellIdentityGsm.lac); p.writeInt32(p_cur->CellInfo.gsm.cellIdentityGsm.cid); - p.writeInt32(p_cur->CellInfo.gsm.cellIdentityGsm.psc); p.writeInt32(p_cur->CellInfo.gsm.signalStrengthGsm.signalStrength); p.writeInt32(p_cur->CellInfo.gsm.signalStrengthGsm.bitErrorRate); break; } + case RIL_CELL_INFO_TYPE_WCDMA: { + appendPrintBuf("%s WCDMA id: mcc=%d,mnc=%d,lac=%d,cid=%d,psc=%d,", printBuf, + p_cur->CellInfo.wcdma.cellIdentityWcdma.mcc, + p_cur->CellInfo.wcdma.cellIdentityWcdma.mnc, + p_cur->CellInfo.wcdma.cellIdentityWcdma.lac, + p_cur->CellInfo.wcdma.cellIdentityWcdma.cid, + p_cur->CellInfo.wcdma.cellIdentityWcdma.psc); + appendPrintBuf("%s wcdmaSS: ss=%d,ber=%d],", printBuf, + p_cur->CellInfo.wcdma.signalStrengthWcdma.signalStrength, + p_cur->CellInfo.wcdma.signalStrengthWcdma.bitErrorRate); + + p.writeInt32(p_cur->CellInfo.wcdma.cellIdentityWcdma.mcc); + p.writeInt32(p_cur->CellInfo.wcdma.cellIdentityWcdma.mnc); + p.writeInt32(p_cur->CellInfo.wcdma.cellIdentityWcdma.lac); + p.writeInt32(p_cur->CellInfo.wcdma.cellIdentityWcdma.cid); + p.writeInt32(p_cur->CellInfo.wcdma.cellIdentityWcdma.psc); + p.writeInt32(p_cur->CellInfo.wcdma.signalStrengthWcdma.signalStrength); + p.writeInt32(p_cur->CellInfo.wcdma.signalStrengthWcdma.bitErrorRate); + break; + } case RIL_CELL_INFO_TYPE_CDMA: { appendPrintBuf("%s CDMA id: nId=%d,sId=%d,bsId=%d,long=%d,lat=%d", printBuf, p_cur->CellInfo.cdma.cellIdentityCdma.networkId, |