commit 0c254185f982f1abe922f1d25804799f903ddee9
author Wyatt Riley <wyattriley@google.com> Tue Aug 29 23:41:53 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Aug 29 23:41:53 2017 +0000
tree 4ddd51785bc587c875c0c88e81cf524d63654698
parent 096308714b5211337d8f76f148372314c8feaf8b
parent 67be3e2f64d3b1daa68b41acaa63435f9502dccd

Merge "Setting clock flags for GPS clock" into oc-mr1-dev
am: 67be3e2f64

Change-Id: I102f0c5c6e122a8f98d1c422dcc18670d72b2767

gnss/1.0/default/GnssMeasurement.cpp

diff --git a/gnss/1.0/default/GnssMeasurement.cpp b/gnss/1.0/default/GnssMeasurement.cpp
index 6c9b838..d81f829 100644
--- a/gnss/1.0/default/GnssMeasurement.cpp
+++ b/gnss/1.0/default/GnssMeasurement.cpp
@@ -182,7 +182,6 @@
 
     auto clockVal = gpsData->clock;
     static uint32_t discontinuity_count_to_handle_old_clock_type = 0;
-    auto flags = clockVal.flags;
 
     gnssData.clock.leapSecond = clockVal.leap_second;
     /*
@@ -205,7 +204,7 @@
             break;
         case GPS_CLOCK_TYPE_GPS_TIME:
             // GPS time, need to convert.
-            flags |= GPS_CLOCK_HAS_FULL_BIAS;
+            clockVal.flags |= GPS_CLOCK_HAS_FULL_BIAS;
             clockVal.full_bias_ns = clockVal.time_ns;
             clockVal.time_ns = 0;
             gnssData.clock.hwClockDiscontinuityCount =