diff options
author | Shinru Han <shinruhan@google.com> | 2020-06-04 04:20:57 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-04 04:20:57 +0000 |
commit | 4aeb4f4b24562a53b6ece3b9addc7199698e2cc1 (patch) | |
tree | caf1f917f75081c2126d1cd85c299b8dbd4a085f | |
parent | 94396cbb48805bae8f97975691ea82781d1f22be (diff) | |
parent | 8d1057762db20c480b6e2c5f8cbe12206ba5809b (diff) | |
download | gps-4aeb4f4b24562a53b6ece3b9addc7199698e2cc1.tar.gz |
Merge CR2660953 am: 8d1057762dandroid-mainline-12.0.0_r112android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseandroid11-mainline-tethering-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseaml_tz2_305400100
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/11685287
Change-Id: Ide441ee9eba68d4875ea03de255be901b55e2e73
-rw-r--r-- | android/2.0/location_api/MeasurementAPIClient.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/android/2.0/location_api/MeasurementAPIClient.cpp b/android/2.0/location_api/MeasurementAPIClient.cpp index b87e508..04e8275 100644 --- a/android/2.0/location_api/MeasurementAPIClient.cpp +++ b/android/2.0/location_api/MeasurementAPIClient.cpp @@ -362,6 +362,7 @@ static void convertGnssData_1_1(GnssMeasurementsNotification& in, static void convertGnssData_2_0(GnssMeasurementsNotification& in, V2_0::IGnssMeasurementCallback::GnssData& out) { + memset(&out, 0, sizeof(V2_0::IGnssMeasurementCallback::GnssData)); out.measurements.resize(in.count); for (size_t i = 0; i < in.count; i++) { convertGnssMeasurement(in.measurements[i], out.measurements[i].v1_1.v1_0); |