Revert "Update GNSS Batching to use new GnssLocation with elapsed realtime (HAL)"
This reverts commit 992cdabf3a4116b56e62f9ea6e7e1aa98131ea0a.
Reason for revert: <INSERT REASONING HERE>
Change-Id: I0215f172f2d37654937ca72522e110a33c2f63c7
diff --git a/gnss/2.0/default/Android.bp b/gnss/2.0/default/Android.bp
index 0fcd764..64187e2 100644
--- a/gnss/2.0/default/Android.bp
+++ b/gnss/2.0/default/Android.bp
@@ -25,7 +25,6 @@
"AGnss.cpp",
"AGnssRil.cpp",
"Gnss.cpp",
- "GnssBatching.cpp",
"GnssMeasurement.cpp",
"GnssMeasurementCorrections.cpp",
"GnssVisibilityControl.cpp",
diff --git a/gnss/2.0/default/Gnss.cpp b/gnss/2.0/default/Gnss.cpp
index 75c2385..bb89b8b 100644
--- a/gnss/2.0/default/Gnss.cpp
+++ b/gnss/2.0/default/Gnss.cpp
@@ -23,7 +23,6 @@
#include "AGnss.h"
#include "AGnssRil.h"
-#include "GnssBatching.h"
#include "GnssConfiguration.h"
#include "GnssMeasurement.h"
#include "GnssMeasurementCorrections.h"
@@ -266,10 +265,6 @@
return new GnssVisibilityControl();
}
-Return<sp<V2_0::IGnssBatching>> Gnss::getExtensionGnssBatching_2_0() {
- return new GnssBatching();
-}
-
Return<bool> Gnss::setCallback_2_0(const sp<V2_0::IGnssCallback>& callback) {
ALOGD("Gnss::setCallback_2_0");
if (callback == nullptr) {
diff --git a/gnss/2.0/default/Gnss.h b/gnss/2.0/default/Gnss.h
index 72f7797..a500128 100644
--- a/gnss/2.0/default/Gnss.h
+++ b/gnss/2.0/default/Gnss.h
@@ -92,7 +92,6 @@
getExtensionMeasurementCorrections() override;
Return<sp<visibility_control::V1_0::IGnssVisibilityControl>> getExtensionVisibilityControl()
override;
- Return<sp<V2_0::IGnssBatching>> getExtensionGnssBatching_2_0() override;
Return<bool> injectBestLocation_2_0(const V2_0::GnssLocation& location) override;
private:
diff --git a/gnss/2.0/default/GnssBatching.cpp b/gnss/2.0/default/GnssBatching.cpp
deleted file mode 100644
index d56cdfb..0000000
--- a/gnss/2.0/default/GnssBatching.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#define LOG_TAG "GnssBatching"
-
-#include "GnssBatching.h"
-
-namespace android {
-namespace hardware {
-namespace gnss {
-namespace V2_0 {
-namespace implementation {
-
-sp<V2_0::IGnssBatchingCallback> GnssBatching::sCallback = nullptr;
-
-// Methods from ::android::hardware::gnss::V1_0::IGnssBatching follow.
-Return<bool> GnssBatching::init(const sp<V1_0::IGnssBatchingCallback>&) {
- // TODO implement
- return bool{};
-}
-
-Return<uint16_t> GnssBatching::getBatchSize() {
- // TODO implement
- return uint16_t{};
-}
-
-Return<bool> GnssBatching::start(const V1_0::IGnssBatching::Options&) {
- // TODO implement
- return bool{};
-}
-
-Return<void> GnssBatching::flush() {
- // TODO implement
- return Void();
-}
-
-Return<bool> GnssBatching::stop() {
- // TODO implement
- return bool{};
-}
-
-Return<void> GnssBatching::cleanup() {
- // TODO implement
- return Void();
-}
-
-// Methods from V2_0::IGnssBatching follow.
-Return<bool> GnssBatching::init_2_0(const sp<V2_0::IGnssBatchingCallback>& callback) {
- sCallback = callback;
- return true;
-}
-
-} // namespace implementation
-} // namespace V2_0
-} // namespace gnss
-} // namespace hardware
-} // namespace android
diff --git a/gnss/2.0/default/GnssBatching.h b/gnss/2.0/default/GnssBatching.h
deleted file mode 100644
index 62ac580..0000000
--- a/gnss/2.0/default/GnssBatching.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <android/hardware/gnss/2.0/IGnssBatching.h>
-#include <hidl/MQDescriptor.h>
-#include <hidl/Status.h>
-
-namespace android {
-namespace hardware {
-namespace gnss {
-namespace V2_0 {
-namespace implementation {
-
-using ::android::sp;
-using ::android::hardware::hidl_array;
-using ::android::hardware::hidl_memory;
-using ::android::hardware::hidl_string;
-using ::android::hardware::hidl_vec;
-using ::android::hardware::Return;
-using ::android::hardware::Void;
-
-struct GnssBatching : public IGnssBatching {
- // Methods from ::android::hardware::gnss::V1_0::IGnssBatching follow.
- Return<bool> init(const sp<V1_0::IGnssBatchingCallback>& callback) override;
- Return<uint16_t> getBatchSize() override;
- Return<bool> start(const V1_0::IGnssBatching::Options& options) override;
- Return<void> flush() override;
- Return<bool> stop() override;
- Return<void> cleanup() override;
-
- // Methods from V2_0::IGnssBatching follow.
- Return<bool> init_2_0(const sp<V2_0::IGnssBatchingCallback>& callback) override;
-
- private:
- static sp<IGnssBatchingCallback> sCallback;
-};
-
-} // namespace implementation
-} // namespace V2_0
-} // namespace gnss
-} // namespace hardware
-} // namespace android
diff --git a/gnss/2.0/default/GnssConfiguration.cpp b/gnss/2.0/default/GnssConfiguration.cpp
index 6bf1712..4389dd2 100644
--- a/gnss/2.0/default/GnssConfiguration.cpp
+++ b/gnss/2.0/default/GnssConfiguration.cpp
@@ -33,11 +33,13 @@
}
Return<bool> GnssConfiguration::setSuplVersion(uint32_t) {
- return true;
+ // TODO implement
+ return bool{};
}
Return<bool> GnssConfiguration::setSuplMode(hidl_bitfield<SuplMode>) {
- return true;
+ // TODO implement
+ return bool{};
}
Return<bool> GnssConfiguration::setGpsLock(hidl_bitfield<GpsLock> gpsLock) {
@@ -47,15 +49,18 @@
}
Return<bool> GnssConfiguration::setLppProfile(hidl_bitfield<LppProfile>) {
- return true;
+ // TODO implement
+ return bool{};
}
Return<bool> GnssConfiguration::setGlonassPositioningProtocol(hidl_bitfield<GlonassPosProtocol>) {
- return true;
+ // TODO implement
+ return bool{};
}
Return<bool> GnssConfiguration::setEmergencySuplPdn(bool) {
- return true;
+ // TODO implement
+ return bool{};
}
// Methods from ::android::hardware::gnss::V1_1::IGnssConfiguration follow.