diff options
author | Cyan_Hsieh <cyanhsieh@google.com> | 2020-02-03 14:55:13 +0800 |
---|---|---|
committer | Cyan_Hsieh <cyanhsieh@google.com> | 2020-02-04 21:38:24 +0800 |
commit | 21b02b0b59e62e7712c1239e96d8ea1ab8ce9f0f (patch) | |
tree | 1c7a047a387e9fa1593b5cda05866e4b5707ae12 /android/2.0/location_api/LocationUtil.h | |
parent | d1eea9d11b92e53e5c5930fb4da5430174d8d167 (diff) | |
parent | df7f25541d10514585e50372d8c2fea723008683 (diff) | |
download | gps-21b02b0b59e62e7712c1239e96d8ea1ab8ce9f0f.tar.gz |
Merge remote-tracking branch 'goog/qcom/release/LA.UM.8.1.C9.09.00.00.518.406' into qt-qpr1-dev
Conflicts:
android/1.0/Gnss.cpp
android/1.1/Gnss.cpp
android/2.0/Gnss.cpp
gnss/GnssAdapter.cpp
Bug: 148752159
Change-Id: Ifc50f4af34c0980973830793a30c9527461b9d7b
Diffstat (limited to 'android/2.0/location_api/LocationUtil.h')
-rw-r--r-- | android/2.0/location_api/LocationUtil.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/android/2.0/location_api/LocationUtil.h b/android/2.0/location_api/LocationUtil.h index 8426de7..d3dce23 100644 --- a/android/2.0/location_api/LocationUtil.h +++ b/android/2.0/location_api/LocationUtil.h @@ -49,6 +49,7 @@ void convertGnssConstellationType(GnssSvType& in, V2_0::GnssConstellationType& o void convertGnssEphemerisType(GnssEphemerisType& in, GnssDebug::SatelliteEphemerisType& out); void convertGnssEphemerisSource(GnssEphemerisSource& in, GnssDebug::SatelliteEphemerisSource& out); void convertGnssEphemerisHealth(GnssEphemerisHealth& in, GnssDebug::SatelliteEphemerisHealth& out); +bool getCurrentTime(struct timespec& currentTime, int64_t& sinceBootTimeNanos); } // namespace implementation } // namespace V2_0 |