diff options
| author | Prema Chand Alugu <premaca@gmail.com> | 2019-02-10 12:39:47 +0530 |
|---|---|---|
| committer | Prema Chand Alugu <premaca@gmail.com> | 2019-02-10 12:39:47 +0530 |
| commit | 5958ab19d070dc3cf2820b4d6d2893044d33046a (patch) | |
| tree | d5d222dc58723c61a499e46bf4294be908b5676d /libril/ril_service.cpp | |
| parent | a914375abc12746227d14269e8fdeaf2ed32188e (diff) | |
| parent | 082e32effc07dddd06b67d2be2c2c6ee554d5d52 (diff) | |
Merge tag 'android-9.0.0_r31' of https://android.googlesource.com/platform/hardware/ril into HEADp9.0
Android 9.0.0 Release 31 (PQ2A.190205.001)
Diffstat (limited to 'libril/ril_service.cpp')
| -rw-r--r-- | libril/ril_service.cpp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/libril/ril_service.cpp b/libril/ril_service.cpp index 07fd49f..7400f30 100644 --- a/libril/ril_service.cpp +++ b/libril/ril_service.cpp @@ -25,6 +25,8 @@ #include <hwbinder/IPCThreadState.h> #include <hwbinder/ProcessState.h> +#include <telephony/ril.h> +#include <telephony/ril_mnc.h> #include <ril_service.h> #include <hidl/HidlTransportSupport.h> #include <utils/SystemClock.h> @@ -3549,7 +3551,7 @@ void fillCellIdentityResponse(CellIdentity &cellIdentity, RIL_CellIdentity_v16 & cellIdentity.cellIdentityGsm[0].mcc = std::to_string(rilCellIdentity.cellIdentityGsm.mcc); cellIdentity.cellIdentityGsm[0].mnc = - std::to_string(rilCellIdentity.cellIdentityGsm.mnc); + ril::util::mnc::decode(rilCellIdentity.cellIdentityGsm.mnc); cellIdentity.cellIdentityGsm[0].lac = rilCellIdentity.cellIdentityGsm.lac; cellIdentity.cellIdentityGsm[0].cid = rilCellIdentity.cellIdentityGsm.cid; cellIdentity.cellIdentityGsm[0].arfcn = rilCellIdentity.cellIdentityGsm.arfcn; @@ -3562,7 +3564,7 @@ void fillCellIdentityResponse(CellIdentity &cellIdentity, RIL_CellIdentity_v16 & cellIdentity.cellIdentityWcdma[0].mcc = std::to_string(rilCellIdentity.cellIdentityWcdma.mcc); cellIdentity.cellIdentityWcdma[0].mnc = - std::to_string(rilCellIdentity.cellIdentityWcdma.mnc); + ril::util::mnc::decode(rilCellIdentity.cellIdentityWcdma.mnc); cellIdentity.cellIdentityWcdma[0].lac = rilCellIdentity.cellIdentityWcdma.lac; cellIdentity.cellIdentityWcdma[0].cid = rilCellIdentity.cellIdentityWcdma.cid; cellIdentity.cellIdentityWcdma[0].psc = rilCellIdentity.cellIdentityWcdma.psc; @@ -3586,7 +3588,7 @@ void fillCellIdentityResponse(CellIdentity &cellIdentity, RIL_CellIdentity_v16 & cellIdentity.cellIdentityLte[0].mcc = std::to_string(rilCellIdentity.cellIdentityLte.mcc); cellIdentity.cellIdentityLte[0].mnc = - std::to_string(rilCellIdentity.cellIdentityLte.mnc); + ril::util::mnc::decode(rilCellIdentity.cellIdentityLte.mnc); cellIdentity.cellIdentityLte[0].ci = rilCellIdentity.cellIdentityLte.ci; cellIdentity.cellIdentityLte[0].pci = rilCellIdentity.cellIdentityLte.pci; cellIdentity.cellIdentityLte[0].tac = rilCellIdentity.cellIdentityLte.tac; @@ -3599,7 +3601,7 @@ void fillCellIdentityResponse(CellIdentity &cellIdentity, RIL_CellIdentity_v16 & cellIdentity.cellIdentityTdscdma[0].mcc = std::to_string(rilCellIdentity.cellIdentityTdscdma.mcc); cellIdentity.cellIdentityTdscdma[0].mnc = - std::to_string(rilCellIdentity.cellIdentityTdscdma.mnc); + ril::util::mnc::decode(rilCellIdentity.cellIdentityTdscdma.mnc); cellIdentity.cellIdentityTdscdma[0].lac = rilCellIdentity.cellIdentityTdscdma.lac; cellIdentity.cellIdentityTdscdma[0].cid = rilCellIdentity.cellIdentityTdscdma.cid; cellIdentity.cellIdentityTdscdma[0].cpid = rilCellIdentity.cellIdentityTdscdma.cpid; @@ -7863,7 +7865,7 @@ void convertRilCellInfoListToHal(void *response, size_t responseLen, hidl_vec<Ce cellInfoGsm->cellIdentityGsm.mcc = std::to_string(rillCellInfo->CellInfo.gsm.cellIdentityGsm.mcc); cellInfoGsm->cellIdentityGsm.mnc = - std::to_string(rillCellInfo->CellInfo.gsm.cellIdentityGsm.mnc); + ril::util::mnc::decode(rillCellInfo->CellInfo.gsm.cellIdentityGsm.mnc); cellInfoGsm->cellIdentityGsm.lac = rillCellInfo->CellInfo.gsm.cellIdentityGsm.lac; cellInfoGsm->cellIdentityGsm.cid = @@ -7887,7 +7889,7 @@ void convertRilCellInfoListToHal(void *response, size_t responseLen, hidl_vec<Ce cellInfoWcdma->cellIdentityWcdma.mcc = std::to_string(rillCellInfo->CellInfo.wcdma.cellIdentityWcdma.mcc); cellInfoWcdma->cellIdentityWcdma.mnc = - std::to_string(rillCellInfo->CellInfo.wcdma.cellIdentityWcdma.mnc); + ril::util::mnc::decode(rillCellInfo->CellInfo.wcdma.cellIdentityWcdma.mnc); cellInfoWcdma->cellIdentityWcdma.lac = rillCellInfo->CellInfo.wcdma.cellIdentityWcdma.lac; cellInfoWcdma->cellIdentityWcdma.cid = @@ -7935,7 +7937,7 @@ void convertRilCellInfoListToHal(void *response, size_t responseLen, hidl_vec<Ce cellInfoLte->cellIdentityLte.mcc = std::to_string(rillCellInfo->CellInfo.lte.cellIdentityLte.mcc); cellInfoLte->cellIdentityLte.mnc = - std::to_string(rillCellInfo->CellInfo.lte.cellIdentityLte.mnc); + ril::util::mnc::decode(rillCellInfo->CellInfo.lte.cellIdentityLte.mnc); cellInfoLte->cellIdentityLte.ci = rillCellInfo->CellInfo.lte.cellIdentityLte.ci; cellInfoLte->cellIdentityLte.pci = @@ -7965,7 +7967,8 @@ void convertRilCellInfoListToHal(void *response, size_t responseLen, hidl_vec<Ce cellInfoTdscdma->cellIdentityTdscdma.mcc = std::to_string(rillCellInfo->CellInfo.tdscdma.cellIdentityTdscdma.mcc); cellInfoTdscdma->cellIdentityTdscdma.mnc = - std::to_string(rillCellInfo->CellInfo.tdscdma.cellIdentityTdscdma.mnc); + ril::util::mnc::decode( + rillCellInfo->CellInfo.tdscdma.cellIdentityTdscdma.mnc); cellInfoTdscdma->cellIdentityTdscdma.lac = rillCellInfo->CellInfo.tdscdma.cellIdentityTdscdma.lac; cellInfoTdscdma->cellIdentityTdscdma.cid = |