diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-06-18 21:25:47 -0700 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2018-06-18 21:25:47 -0700 |
| commit | 86a54b806aa634c9eadf1ae91e5487f23a345cbf (patch) | |
| tree | 3ae24f97a8994134e1737b5f23fb2274bc6bb412 | |
| parent | 4e9fdf06a783a5144282b09854699a0889c602af (diff) | |
| parent | 767770dcffb7a6553d25740d2975b6e201f592be (diff) | |
| download | android_hardware_ril-86a54b806aa634c9eadf1ae91e5487f23a345cbf.tar.gz android_hardware_ril-86a54b806aa634c9eadf1ae91e5487f23a345cbf.tar.bz2 android_hardware_ril-86a54b806aa634c9eadf1ae91e5487f23a345cbf.zip | |
Merge 767770dcffb7a6553d25740d2975b6e201f592be on remote branch
Change-Id: I727838bc9dc42bc3e17535bafb5580b6ae3789d7
| -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), |