diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-05-13 07:26:06 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-05-13 07:26:06 +0000 |
| commit | 3f56b764d481907bbe28c79b44149bbed6937faf (patch) | |
| tree | 8e788c1627b37a1b7607f855619483809345bd92 | |
| parent | a4b1baddf4ecfff1c9a509730f0e462208923a4f (diff) | |
| parent | 982ba7ab0767df77b0cda7f592bfde7e8b6cb53d (diff) | |
| download | android_hardware_ril-3f56b764d481907bbe28c79b44149bbed6937faf.tar.gz android_hardware_ril-3f56b764d481907bbe28c79b44149bbed6937faf.tar.bz2 android_hardware_ril-3f56b764d481907bbe28c79b44149bbed6937faf.zip | |
Snap for 4778776 from 982ba7ab0767df77b0cda7f592bfde7e8b6cb53d to pi-release
Change-Id: I7b8a0c69fbd4b62e15f451bbd7146b3e08a231d4
| -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 b8862dc..07fd49f 100644 --- a/libril/ril_service.cpp +++ b/libril/ril_service.cpp @@ -8386,7 +8386,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), |