commit d6f3e7e33266e1a11f047f6aba7e25c69d6b2d94
author Sam Lin <samlin@google.com> Fri Feb 22 01:40:21 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 22 01:40:21 2019 +0000
tree c9090cb78d92971a42cd75d41dd8d8cec194c192
parent 40f0b8575d403b338767b63ecc6a41d61033f769
parent e0aeded78ce131e43d14fdb4964f9c274fe14d00

Merge "Add foldable config"

gps/gps_qemu.c

diff --git a/gps/gps_qemu.c b/gps/gps_qemu.c
index a5b205e..59d2f4e 100644
--- a/gps/gps_qemu.c
+++ b/gps/gps_qemu.c
@@ -230,7 +230,6 @@
     int     utc_year;
     int     utc_mon;
     int     utc_day;
-    int     utc_diff;
     GpsLocation  fix;
     gps_location_callback  callback;
     GnssData    gnss_data;
@@ -241,34 +240,6 @@
     bool    fix_provided_by_gnss; /* passed in from _gps_state */
 } NmeaReader;
 
-
-static void
-nmea_reader_update_utc_diff( NmeaReader*  r )
-{
-    time_t         now = time(NULL);
-    struct tm      tm_local;
-    struct tm      tm_utc;
-    long           time_local, time_utc;
-
-    gmtime_r( &now, &tm_utc );
-    localtime_r( &now, &tm_local );
-
-    time_local = tm_local.tm_sec +
-                 60*(tm_local.tm_min +
-                 60*(tm_local.tm_hour +
-                 24*(tm_local.tm_yday +
-                 365*tm_local.tm_year)));
-
-    time_utc = tm_utc.tm_sec +
-               60*(tm_utc.tm_min +
-               60*(tm_utc.tm_hour +
-               24*(tm_utc.tm_yday +
-               365*tm_utc.tm_year)));
-
-    r->utc_diff = time_utc - time_local;
-}
-
-
 static void
 nmea_reader_init( NmeaReader*  r )
 {
@@ -286,7 +257,6 @@
     r->gnss_enabled = s->gnss_enabled;
     r->fix_provided_by_gnss = s->fix_provided_by_gnss;
 
-    nmea_reader_update_utc_diff( r );
 }
 
 
@@ -322,14 +292,7 @@
     tm.tm_mday  = r->utc_day;
     tm.tm_isdst = -1;
 
-    // This is a little confusing, let's use an example:
-    // Suppose now it's 1970-1-1 01:00 GMT, local time is 1970-1-1 00:00 GMT-1
-    // Then the utc_diff is 3600.
-    // The time string from GPS is 01:00:00, mktime assumes it's a local
-    // time. So we are doing mktime for 1970-1-1 01:00 GMT-1. The result of
-    // mktime is 7200 (1970-1-1 02:00 GMT) actually. To get the correct
-    // timestamp, we have to subtract utc_diff here.
-    fix_time = mktime( &tm ) - r->utc_diff;
+    fix_time = timegm( &tm );
     r->fix.timestamp = (long long)fix_time * 1000;
     return 0;
 }
@@ -641,7 +604,9 @@
         if (r->fix.flags & GPS_LOCATION_HAS_ACCURACY) {
             p += snprintf(p,end-p, " accuracy=%g", r->fix.accuracy);
         }
-        gmtime_r( (time_t*) &r->fix.timestamp, &utc );
+        //The unit of r->fix.timestamp is millisecond.
+        time_t timestamp = r->fix.timestamp / 1000;
+        gmtime_r( (time_t*) &timestamp, &utc );
         p += snprintf(p, end-p, " time=%s", asctime( &utc ) );
 #endif
         if (r->callback) {