Snap for 4778776 from 982ba7ab0767df77b0cda7f592bfde7e8b6cb53d to pi-release
Change-Id: I7b8a0c69fbd4b62e15f451bbd7146b3e08a231d4
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 @@
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 @@
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),
