summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-01-17 05:14:54 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-01-17 05:14:54 +0000
commitd4049b802842b0f233ba00b8ef982a7983f65185 (patch)
tree9c5845a064580f0fa62df734e3d5b20205558b69
parentac9f22fd6e124fb59fd1e8972329443b65135341 (diff)
parentd1eea9d11b92e53e5c5930fb4da5430174d8d167 (diff)
downloadgps-d4049b802842b0f233ba00b8ef982a7983f65185.tar.gz
Merge "stub out injectTime API as we should not handle that" into qt-qpr1-dev am: d1eea9d11b
Change-Id: I36c73a5a03a7ec858f32649c76523efd8b764886
-rw-r--r--android/1.0/Gnss.cpp9
-rw-r--r--android/1.1/Gnss.cpp9
-rw-r--r--android/2.0/Gnss.cpp9
3 files changed, 3 insertions, 24 deletions
diff --git a/android/1.0/Gnss.cpp b/android/1.0/Gnss.cpp
index 4aac432..8fe4d3f 100644
--- a/android/1.0/Gnss.cpp
+++ b/android/1.0/Gnss.cpp
@@ -264,14 +264,7 @@ Return<bool> Gnss::injectLocation(double latitudeDegrees,
Return<bool> Gnss::injectTime(int64_t timeMs, int64_t timeReferenceMs,
int32_t uncertaintyMs) {
- ENTRY_LOG_CALLFLOW();
- const GnssInterface* gnssInterface = getGnssInterface();
- if (nullptr != gnssInterface) {
- gnssInterface->injectTime(timeMs, timeReferenceMs, uncertaintyMs);
- return true;
- } else {
- return false;
- }
+ return false;
}
Return<void> Gnss::deleteAidingData(V1_0::IGnss::GnssAidingData aidingDataFlags) {
diff --git a/android/1.1/Gnss.cpp b/android/1.1/Gnss.cpp
index 277dbc1..aa761e2 100644
--- a/android/1.1/Gnss.cpp
+++ b/android/1.1/Gnss.cpp
@@ -305,14 +305,7 @@ Return<bool> Gnss::injectLocation(double latitudeDegrees,
Return<bool> Gnss::injectTime(int64_t timeMs, int64_t timeReferenceMs,
int32_t uncertaintyMs) {
- ENTRY_LOG_CALLFLOW();
- const GnssInterface* gnssInterface = getGnssInterface();
- if (nullptr != gnssInterface) {
- gnssInterface->injectTime(timeMs, timeReferenceMs, uncertaintyMs);
- return true;
- } else {
- return false;
- }
+ return false;
}
Return<void> Gnss::deleteAidingData(V1_0::IGnss::GnssAidingData aidingDataFlags) {
diff --git a/android/2.0/Gnss.cpp b/android/2.0/Gnss.cpp
index 2276c14..8fa42ff 100644
--- a/android/2.0/Gnss.cpp
+++ b/android/2.0/Gnss.cpp
@@ -330,14 +330,7 @@ Return<bool> Gnss::injectLocation(double latitudeDegrees,
Return<bool> Gnss::injectTime(int64_t timeMs, int64_t timeReferenceMs,
int32_t uncertaintyMs) {
- ENTRY_LOG_CALLFLOW();
- const GnssInterface* gnssInterface = getGnssInterface();
- if (nullptr != gnssInterface) {
- gnssInterface->injectTime(timeMs, timeReferenceMs, uncertaintyMs);
- return true;
- } else {
- return false;
- }
+ return false;
}
Return<void> Gnss::deleteAidingData(V1_0::IGnss::GnssAidingData aidingDataFlags) {