diff options
| author | Eric Arseneau <earseneau@google.com> | 2018-05-14 08:50:47 -0700 |
|---|---|---|
| committer | Eric Arseneau <earseneau@google.com> | 2018-05-14 08:50:47 -0700 |
| commit | 113dbaa061b837ed4f743dffc1d60466a88acd85 (patch) | |
| tree | 3ae24f97a8994134e1737b5f23fb2274bc6bb412 | |
| parent | 41686ede2f9c0e4d97c5a5803dfb28df067f2e89 (diff) | |
| parent | 3f56b764d481907bbe28c79b44149bbed6937faf (diff) | |
| download | android_hardware_ril-113dbaa061b837ed4f743dffc1d60466a88acd85.tar.gz android_hardware_ril-113dbaa061b837ed4f743dffc1d60466a88acd85.tar.bz2 android_hardware_ril-113dbaa061b837ed4f743dffc1d60466a88acd85.zip | |
Merge PPR1.180514.001
Change-Id: Idfba35fb8a205cdd273748218efc75159c2af834
| -rw-r--r-- | include/telephony/ril.h | 1 | ||||
| -rw-r--r-- | libril/ril_service.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/telephony/ril.h b/include/telephony/ril.h index 8377308..c4add62 100644 --- a/include/telephony/ril.h +++ b/include/telephony/ril.h @@ -2183,6 +2183,7 @@ typedef struct { RIL_ScanStatus status; // The status of the scan uint32_t network_infos_length; // Total length of RIL_CellInfo RIL_CellInfo_v12* network_infos; // List of network information + RIL_Errno error; } RIL_NetworkScanResult; /** diff --git a/libril/ril_service.cpp b/libril/ril_service.cpp index 473ef03..fc0a5e5 100644 --- a/libril/ril_service.cpp +++ b/libril/ril_service.cpp @@ -8395,7 +8395,7 @@ int radio::networkScanResultInd(int slotId, V1_1::NetworkScanResult result; result.status = (V1_1::ScanStatus) networkScanResult->status; - result.error = (RadioError) e; + result.error = (RadioError) networkScanResult->error; convertRilCellInfoListToHal( networkScanResult->network_infos, networkScanResult->network_infos_length * sizeof(RIL_CellInfo_v12), |