Revert "Add IAGnssRil AIDL HAL (hardware/interfaces)"
Revert "Add AGnssRil AIDL HAL (frameworks/base)"
Revert submission 16548632-IAGnssRil-AIDL
Reason for revert: Breaking Build
BUGID: b/213964109
Reverted Changes:
I087f7c9ae:Add AGnssRil AIDL HAL (frameworks/base)
Ie5746ae25:Add IAGnssRil AIDL HAL (hardware/interfaces)
Change-Id: I2404199e0b881a18429cc2a4ebc87bb41e5be655
diff --git a/gnss/aidl/default/AGnssRil.cpp b/gnss/aidl/default/AGnssRil.cpp
deleted file mode 100644
index e6009bd..0000000
--- a/gnss/aidl/default/AGnssRil.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2021 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 "AGnssRilAidl"
-
-#include "AGnssRil.h"
-#include <log/log.h>
-
-namespace aidl::android::hardware::gnss {
-
-std::shared_ptr<IAGnssRilCallback> AGnssRil::sCallback = nullptr;
-
-ndk::ScopedAStatus AGnssRil::setCallback(const std::shared_ptr<IAGnssRilCallback>& callback) {
- ALOGD("AGnssRil::setCallback");
- std::unique_lock<std::mutex> lock(mMutex);
- sCallback = callback;
- return ndk::ScopedAStatus::ok();
-}
-
-ndk::ScopedAStatus AGnssRil::setRefLocation(const AGnssRefLocation& agnssReflocation) {
- const AGnssRefLocationCellID& cellInfo = agnssReflocation.cellID;
- ALOGD("AGnssRil::setRefLocation: type: %s, mcc: %d, mnc: %d, lac: %d, cid: %ld, tac: %d, pcid: "
- "%d, arfcn: %d",
- toString(agnssReflocation.type).c_str(), cellInfo.mcc, cellInfo.mnc, cellInfo.lac,
- cellInfo.cid, cellInfo.tac, cellInfo.pcid, cellInfo.arfcn);
- return ndk::ScopedAStatus::ok();
-}
-
-ndk::ScopedAStatus AGnssRil::setSetId(SetIDType type, const std::string& setid) {
- ALOGD("AGnssRil::setSetId: type:%s, setid: %s", toString(type).c_str(), setid.c_str());
- return ndk::ScopedAStatus::ok();
-}
-
-ndk::ScopedAStatus AGnssRil::updateNetworkState(const NetworkAttributes& attributes) {
- ALOGD("AGnssRil::updateNetworkState: networkHandle: %ld, isConnected: %d, capabilities: %d, "
- "apn: %s",
- attributes.networkHandle, attributes.isConnected, attributes.capabilities,
- attributes.apn.c_str());
- return ndk::ScopedAStatus::ok();
-}
-
-} // namespace aidl::android::hardware::gnss
diff --git a/gnss/aidl/default/AGnssRil.h b/gnss/aidl/default/AGnssRil.h
deleted file mode 100644
index 7e429ee..0000000
--- a/gnss/aidl/default/AGnssRil.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2021 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 <aidl/android/hardware/gnss/BnAGnssRil.h>
-
-namespace aidl::android::hardware::gnss {
-
-struct AGnssRil : public BnAGnssRil {
- public:
- ndk::ScopedAStatus setCallback(const std::shared_ptr<IAGnssRilCallback>& callback) override;
- ndk::ScopedAStatus setRefLocation(const AGnssRefLocation& agnssReflocation) override;
- ndk::ScopedAStatus setSetId(SetIDType type, const std::string& setid) override;
- ndk::ScopedAStatus updateNetworkState(const NetworkAttributes& attributes) override;
-
- private:
- // Synchronization lock for sCallback
- mutable std::mutex mMutex;
- // Guarded by mMutex
- static std::shared_ptr<IAGnssRilCallback> sCallback;
-};
-
-} // namespace aidl::android::hardware::gnss
diff --git a/gnss/aidl/default/Android.bp b/gnss/aidl/default/Android.bp
index 5797e1c..29c26d1 100644
--- a/gnss/aidl/default/Android.bp
+++ b/gnss/aidl/default/Android.bp
@@ -56,7 +56,6 @@
"android.hardware.gnss-V2-ndk",
],
srcs: [
- "AGnssRil.cpp",
"AGnss.cpp",
"Gnss.cpp",
"GnssBatching.cpp",
diff --git a/gnss/aidl/default/Gnss.cpp b/gnss/aidl/default/Gnss.cpp
index dba54a0..e296351 100644
--- a/gnss/aidl/default/Gnss.cpp
+++ b/gnss/aidl/default/Gnss.cpp
@@ -20,7 +20,6 @@
#include <inttypes.h>
#include <log/log.h>
#include "AGnss.h"
-#include "AGnssRil.h"
#include "GnssBatching.h"
#include "GnssConfiguration.h"
#include "GnssDebug.h"
@@ -155,7 +154,7 @@
return ScopedAStatus::ok();
}
-ScopedAStatus Gnss::getExtensionAGnss(std::shared_ptr<IAGnss>* iAGnss) {
+ndk::ScopedAStatus Gnss::getExtensionAGnss(std::shared_ptr<IAGnss>* iAGnss) {
ALOGD("Gnss::getExtensionAGnss");
*iAGnss = SharedRefBase::make<AGnss>();
return ndk::ScopedAStatus::ok();
@@ -167,12 +166,6 @@
return ScopedAStatus::ok();
}
-ScopedAStatus Gnss::getExtensionAGnssRil(std::shared_ptr<IAGnssRil>* iAGnssRil) {
- ALOGD("Gnss::getExtensionAGnssRil");
- *iAGnssRil = SharedRefBase::make<AGnssRil>();
- return ndk::ScopedAStatus::ok();
-}
-
ScopedAStatus Gnss::injectLocation(const GnssLocation& location) {
ALOGD("injectLocation. lat:%lf, lng:%lf, acc:%f", location.latitudeDegrees,
location.longitudeDegrees, location.horizontalAccuracyMeters);
diff --git a/gnss/aidl/default/Gnss.h b/gnss/aidl/default/Gnss.h
index 731eaa3..384c862 100644
--- a/gnss/aidl/default/Gnss.h
+++ b/gnss/aidl/default/Gnss.h
@@ -17,7 +17,6 @@
#pragma once
#include <aidl/android/hardware/gnss/BnAGnss.h>
-#include <aidl/android/hardware/gnss/BnAGnssRil.h>
#include <aidl/android/hardware/gnss/BnGnss.h>
#include <aidl/android/hardware/gnss/BnGnssBatching.h>
#include <aidl/android/hardware/gnss/BnGnssConfiguration.h>
@@ -66,7 +65,6 @@
ndk::ScopedAStatus getExtensionGnssNavigationMessage(
std::shared_ptr<IGnssNavigationMessageInterface>* iGnssNavigationMessage) override;
ndk::ScopedAStatus getExtensionAGnss(std::shared_ptr<IAGnss>* iAGnss) override;
- ndk::ScopedAStatus getExtensionAGnssRil(std::shared_ptr<IAGnssRil>* iAGnssRil) override;
ndk::ScopedAStatus getExtensionGnssDebug(std::shared_ptr<IGnssDebug>* iGnssDebug) override;
ndk::ScopedAStatus getExtensionGnssVisibilityControl(
std::shared_ptr<android::hardware::gnss::visibility_control::IGnssVisibilityControl>*