Merge "Use direct assignment to replace memcpy" am: d5461a4f08 am: 97abdd412e

am: a2140dacee

Change-Id: I73fc3f1401c7dfad0f5fa577bd2ed4c3b5d7511c

diff --cc libril/ril_service.cpp
index d6bf641,97e61a8..fb58c0b
--- 1/libril/ril_service.cpp
--- 2/libril/ril_service.cpp
+++ b/libril/ril_service.cpp
@@@ -1398,11 -1386,13 +1398,13 @@@ Return<void> RadioImpl::startNetworkSca
                  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];
+         }
      }
  
 -    s_vendorFunctions->onRequest(
 -            RIL_REQUEST_START_NETWORK_SCAN, &scan_request, sizeof(scan_request), pRI);
 +    CALL_ONREQUEST(RIL_REQUEST_START_NETWORK_SCAN, &scan_request, sizeof(scan_request), pRI,
 +            mSlotId);
  
      return Void();
  }