From 982ba7ab0767df77b0cda7f592bfde7e8b6cb53d Mon Sep 17 00:00:00 2001 From: Sooraj Sasindran Date: Mon, 7 May 2018 21:20:43 -0700 Subject: Add scan error to Network Scan result Add scan error to Network Scan result Bug: 79377435 Test: Verified that SCAN is always responding fine Change-Id: If0232826aa14fb35fc7a5324bdc95368c88994f5 --- include/telephony/ril.h | 1 + libril/ril_service.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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), -- cgit v1.2.3