summaryrefslogtreecommitdiff
path: root/gps/android/GnssMeasurement.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'gps/android/GnssMeasurement.cpp')
-rw-r--r--gps/android/GnssMeasurement.cpp34
1 files changed, 2 insertions, 32 deletions
diff --git a/gps/android/GnssMeasurement.cpp b/gps/android/GnssMeasurement.cpp
index 2578a85..1c65bd6 100644
--- a/gps/android/GnssMeasurement.cpp
+++ b/gps/android/GnssMeasurement.cpp
@@ -27,7 +27,7 @@
namespace android {
namespace hardware {
namespace gnss {
-namespace V1_1 {
+namespace V1_0 {
namespace implementation {
void GnssMeasurement::GnssMeasurementDeathRecipient::serviceDied(
@@ -89,43 +89,13 @@ Return<void> GnssMeasurement::close() {
mGnssMeasurementCbIface->unlinkToDeath(mGnssMeasurementDeathRecipient);
mGnssMeasurementCbIface = nullptr;
}
- if (mGnssMeasurementCbIface_1_1 != nullptr) {
- mGnssMeasurementCbIface_1_1->unlinkToDeath(mGnssMeasurementDeathRecipient);
- mGnssMeasurementCbIface_1_1 = nullptr;
- }
mApi->measurementClose();
return Void();
}
-// Methods from ::android::hardware::gnss::V1_1::IGnssMeasurement follow.
-Return<GnssMeasurement::GnssMeasurementStatus> GnssMeasurement::setCallback_1_1(
- const sp<IGnssMeasurementCallback>& callback, bool /*enableFullTracking*/) {
-
- Return<IGnssMeasurement::GnssMeasurementStatus> ret =
- IGnssMeasurement::GnssMeasurementStatus::ERROR_GENERIC;
- if (mGnssMeasurementCbIface_1_1 != nullptr) {
- LOC_LOGE("%s]: GnssMeasurementCallback is already set", __FUNCTION__);
- return IGnssMeasurement::GnssMeasurementStatus::ERROR_ALREADY_INIT;
- }
-
- if (callback == nullptr) {
- LOC_LOGE("%s]: callback is nullptr", __FUNCTION__);
- return ret;
- }
- if (mApi == nullptr) {
- LOC_LOGE("%s]: mApi is nullptr", __FUNCTION__);
- return ret;
- }
-
- mGnssMeasurementCbIface_1_1 = callback;
- mGnssMeasurementCbIface_1_1->linkToDeath(mGnssMeasurementDeathRecipient, 0);
-
- return mApi->measurementSetCallback_1_1(callback);
-}
-
} // namespace implementation
-} // namespace V1_1
+} // namespace V1_0
} // namespace gnss
} // namespace hardware
} // namespace android