summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2017-06-27 07:29:47 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2017-06-27 07:29:47 +0000
commit7a31e7d69ca4edb22fb3414dcf4ca937d49e14c2 (patch)
tree8132c599d9011d85049c3005c49271338bb5f2ab
parentd74e93474333b342bad0a43f09009168e5830a90 (diff)
parent9c7ad93840f7e21adf9fbcf0d23b1d4c69ee9fab (diff)
downloadandroid_hardware_ril-7a31e7d69ca4edb22fb3414dcf4ca937d49e14c2.tar.gz
android_hardware_ril-7a31e7d69ca4edb22fb3414dcf4ca937d49e14c2.tar.bz2
android_hardware_ril-7a31e7d69ca4edb22fb3414dcf4ca937d49e14c2.zip
release-request-fc66b004-9a6d-499c-b541-7c17163fe60f-for-git_oc-dr1-release-4136913 snap-temp-L82300000077883774
Change-Id: If7bdd2be2c3de2d39a178d538a200e17e79b888c
-rw-r--r--libril/ril_service.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/libril/ril_service.cpp b/libril/ril_service.cpp
index f67575b..a2bede4 100644
--- a/libril/ril_service.cpp
+++ b/libril/ril_service.cpp
@@ -1394,7 +1394,9 @@ Return<void> RadioImpl::startNetworkScan(int32_t serial, const NetworkScanReques
return Void();
}
// safe to copy to geran_bands because it's a union member
- std::memcpy(&ras_to.bands.geran_bands, bands, ras_to.bands_length * sizeof(uint32_t));
+ for (size_t idx = 0; idx < ras_to.bands_length; ++idx) {
+ ras_to.bands.geran_bands[idx] = (RIL_GeranBands) (*bands)[idx];
+ }
}
CALL_ONREQUEST(RIL_REQUEST_START_NETWORK_SCAN, &scan_request, sizeof(scan_request), pRI,