Revert "Update libradiocompat for IRadioIms in CF"
Revert submission 20106610-ims-hal-cf
Reason for revert: Test failure with v2/android-app-compat-engprod/g3compat/g3-app-compat-main
Reverted Changes:
I2376f08c4:Update libradiocompat for IRadioIms in CF
Ib2cc006d5:Implement IRadioIms in CF
Change-Id: Id1062e908e067dd3ec01f3ecf43021368d5dc91e
diff --git a/radio/aidl/compat/libradiocompat/Android.bp b/radio/aidl/compat/libradiocompat/Android.bp
index 0ceaec4..f79e045 100644
--- a/radio/aidl/compat/libradiocompat/Android.bp
+++ b/radio/aidl/compat/libradiocompat/Android.bp
@@ -37,7 +37,6 @@
"android.hardware.radio.config@1.2",
"android.hardware.radio.config@1.3",
"android.hardware.radio.data-V1-ndk",
- "android.hardware.radio.ims-V1-ndk",
"android.hardware.radio.messaging-V1-ndk",
"android.hardware.radio.modem-V1-ndk",
"android.hardware.radio.network-V2-ndk",
@@ -70,9 +69,6 @@
"data/RadioResponse-data.cpp",
"data/RadioData.cpp",
"data/structs.cpp",
- "ims/RadioIndication-ims.cpp",
- "ims/RadioResponse-ims.cpp",
- "ims/RadioIms.cpp",
"messaging/RadioIndication-messaging.cpp",
"messaging/RadioMessaging.cpp",
"messaging/RadioResponse-messaging.cpp",
diff --git a/radio/aidl/compat/libradiocompat/ims/RadioIms.cpp b/radio/aidl/compat/libradiocompat/ims/RadioIms.cpp
deleted file mode 100644
index 3a07f84..0000000
--- a/radio/aidl/compat/libradiocompat/ims/RadioIms.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (C) 2022 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.
- */
-
-#include <libradiocompat/RadioIms.h>
-
-#include "commonStructs.h"
-#include "debug.h"
-
-#include "collections.h"
-
-#define RADIO_MODULE "Ims"
-
-namespace android::hardware::radio::compat {
-
-using ::ndk::ScopedAStatus;
-namespace aidl = ::aidl::android::hardware::radio::ims;
-constexpr auto ok = &ScopedAStatus::ok;
-
-std::shared_ptr<aidl::IRadioImsResponse> RadioIms::respond() {
- return mCallbackManager->response().imsCb();
-}
-
-ScopedAStatus RadioIms::setSrvccCallInfo(
- int32_t serial, const std::vector<aidl::SrvccCall>& /*srvccCalls*/) {
- LOG_CALL << serial;
- LOG(ERROR) << " setSrvccCallInfo is unsupported by HIDL HALs";
- return ok();
-}
-ScopedAStatus RadioIms::updateImsRegistrationInfo(
- int32_t serial, const aidl::ImsRegistration& /*imsRegistration*/) {
- LOG_CALL << serial;
- LOG(ERROR) << " updateImsRegistrationInfo is unsupported by HIDL HALs";
- return ok();
-}
-ScopedAStatus RadioIms::startImsTraffic(
- int32_t serial, const std::string& /*token*/, aidl::ImsTrafficType /*imsTrafficType*/,
- ::aidl::android::hardware::radio::AccessNetwork /*accessNetworkType*/) {
- LOG_CALL << serial;
- LOG(ERROR) << " startImsTraffic is unsupported by HIDL HALs";
- return ok();
-}
-ScopedAStatus RadioIms::stopImsTraffic(int32_t serial, const std::string& /*token*/) {
- LOG_CALL << serial;
- LOG(ERROR) << " stopImsTraffic is unsupported by HIDL HALs";
- return ok();
-}
-ScopedAStatus RadioIms::triggerEpsFallback(int32_t serial, aidl::EpsFallbackReason /*reason*/) {
- LOG_CALL << serial;
- LOG(ERROR) << " triggerEpsFallback is unsupported by HIDL HALs";
- return ok();
-}
-ScopedAStatus RadioIms::sendAnbrQuery(
- int32_t serial, aidl::ImsStreamType /*mediaType*/, aidl::ImsStreamDirection /*direction*/,
- int32_t /*bitsPerSecond*/) {
- LOG_CALL << serial;
- LOG(ERROR) << " sendAnbrQuery is unsupported by HIDL HALs";
- return ok();
-}
-
-ScopedAStatus RadioIms::setResponseFunctions(
- const std::shared_ptr<aidl::IRadioImsResponse>& response,
- const std::shared_ptr<aidl::IRadioImsIndication>& indication) {
- LOG_CALL << response << ' ' << indication;
- mCallbackManager->setResponseFunctions(response, indication);
- return ok();
-}
-
-} // namespace android::hardware::radio::compat
diff --git a/radio/aidl/compat/libradiocompat/ims/RadioIndication-ims.cpp b/radio/aidl/compat/libradiocompat/ims/RadioIndication-ims.cpp
deleted file mode 100644
index 10109b8..0000000
--- a/radio/aidl/compat/libradiocompat/ims/RadioIndication-ims.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2022 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.
- */
-
-#include <libradiocompat/RadioIndication.h>
-
-#include "commonStructs.h"
-#include "debug.h"
-
-#include "collections.h"
-
-#define RADIO_MODULE "ImsIndication"
-
-namespace android::hardware::radio::compat {
-
-using ::aidl::android::hardware::radio::RadioTechnology;
-namespace aidl = ::aidl::android::hardware::radio::ims;
-
-void RadioIndication::setResponseFunction(std::shared_ptr<aidl::IRadioImsIndication> imsCb) {
- mImsCb = imsCb;
-}
-
-std::shared_ptr<aidl::IRadioImsIndication> RadioIndication::imsCb() {
- return mImsCb.get();
-}
-
-} // namespace android::hardware::radio::compat
diff --git a/radio/aidl/compat/libradiocompat/ims/RadioResponse-ims.cpp b/radio/aidl/compat/libradiocompat/ims/RadioResponse-ims.cpp
deleted file mode 100644
index 831a0ae..0000000
--- a/radio/aidl/compat/libradiocompat/ims/RadioResponse-ims.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2022 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.
- */
-
-#include <libradiocompat/RadioResponse.h>
-
-#include "commonStructs.h"
-#include "debug.h"
-
-#include "collections.h"
-
-#define RADIO_MODULE "ImsResponse"
-
-namespace android::hardware::radio::compat {
-
-namespace aidl = ::aidl::android::hardware::radio::ims;
-
-void RadioResponse::setResponseFunction(std::shared_ptr<aidl::IRadioImsResponse> imsCb) {
- mImsCb = imsCb;
-}
-
-std::shared_ptr<aidl::IRadioImsResponse> RadioResponse::imsCb() {
- return mImsCb.get();
-}
-
-} // namespace android::hardware::radio::compat
diff --git a/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioIms.h b/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioIms.h
deleted file mode 100644
index eaf6e0f..0000000
--- a/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioIms.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2022 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 "RadioCompatBase.h"
-
-#include <aidl/android/hardware/radio/ims/BnRadioIms.h>
-
-namespace android::hardware::radio::compat {
-
-class RadioIms : public RadioCompatBase, public aidl::android::hardware::radio::ims::BnRadioIms {
- ::ndk::ScopedAStatus setSrvccCallInfo(
- int32_t serial,
- const std::vector<::aidl::android::hardware::radio::ims::SrvccCall>& srvccCalls)
- override;
- ::ndk::ScopedAStatus updateImsRegistrationInfo(
- int32_t serial,
- const ::aidl::android::hardware::radio::ims::ImsRegistration& imsRegistration) override;
- ::ndk::ScopedAStatus startImsTraffic(
- int32_t serial, const std::string& token,
- ::aidl::android::hardware::radio::ims::ImsTrafficType imsTrafficType,
- ::aidl::android::hardware::radio::AccessNetwork accessNetworkType) override;
- ::ndk::ScopedAStatus stopImsTraffic(int32_t serial, const std::string& token) override;
- ::ndk::ScopedAStatus triggerEpsFallback(
- int32_t serial,
- ::aidl::android::hardware::radio::ims::EpsFallbackReason reason) override;
- ::ndk::ScopedAStatus sendAnbrQuery(
- int32_t serial, ::aidl::android::hardware::radio::ims::ImsStreamType mediaType,
- ::aidl::android::hardware::radio::ims::ImsStreamDirection direction,
- int32_t bitsPerSecond) override;
- ::ndk::ScopedAStatus setResponseFunctions(
- const std::shared_ptr<::aidl::android::hardware::radio::ims::IRadioImsResponse>&
- radioImsResponse,
- const std::shared_ptr<::aidl::android::hardware::radio::ims::IRadioImsIndication>&
- radioImsIndication) override;
-
- protected:
- std::shared_ptr<::aidl::android::hardware::radio::ims::IRadioImsResponse> respond();
-
- public:
- using RadioCompatBase::RadioCompatBase;
-};
-
-} // namespace android::hardware::radio::compat
diff --git a/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioIndication.h b/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioIndication.h
index f042456..6cfd59c 100644
--- a/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioIndication.h
+++ b/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioIndication.h
@@ -19,7 +19,6 @@
#include "GuaranteedCallback.h"
#include <aidl/android/hardware/radio/data/IRadioDataIndication.h>
-#include <aidl/android/hardware/radio/ims/IRadioImsIndication.h>
#include <aidl/android/hardware/radio/messaging/IRadioMessagingIndication.h>
#include <aidl/android/hardware/radio/modem/IRadioModemIndication.h>
#include <aidl/android/hardware/radio/network/IRadioNetworkIndication.h>
@@ -56,10 +55,6 @@
::aidl::android::hardware::radio::voice::IRadioVoiceIndication,
::aidl::android::hardware::radio::voice::IRadioVoiceIndicationDefault, true>
mVoiceCb;
- GuaranteedCallback< //
- ::aidl::android::hardware::radio::ims::IRadioImsIndication,
- ::aidl::android::hardware::radio::ims::IRadioImsIndicationDefault, true>
- mImsCb;
// IRadioIndication @ 1.0
Return<void> radioStateChanged(V1_0::RadioIndicationType type,
@@ -225,8 +220,6 @@
std::shared_ptr<::aidl::android::hardware::radio::sim::IRadioSimIndication> simCb);
void setResponseFunction(
std::shared_ptr<::aidl::android::hardware::radio::voice::IRadioVoiceIndication> voicCb);
- void setResponseFunction(
- std::shared_ptr<::aidl::android::hardware::radio::ims::IRadioImsIndication> imsCb);
std::shared_ptr<::aidl::android::hardware::radio::data::IRadioDataIndication> dataCb();
std::shared_ptr<::aidl::android::hardware::radio::messaging::IRadioMessagingIndication>
@@ -235,7 +228,6 @@
std::shared_ptr<::aidl::android::hardware::radio::network::IRadioNetworkIndication> networkCb();
std::shared_ptr<::aidl::android::hardware::radio::sim::IRadioSimIndication> simCb();
std::shared_ptr<::aidl::android::hardware::radio::voice::IRadioVoiceIndication> voiceCb();
- std::shared_ptr<::aidl::android::hardware::radio::ims::IRadioImsIndication> imsCb();
};
} // namespace android::hardware::radio::compat
diff --git a/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioResponse.h b/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioResponse.h
index 22451ae..1f82dd1 100644
--- a/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioResponse.h
+++ b/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioResponse.h
@@ -19,7 +19,6 @@
#include "GuaranteedCallback.h"
#include <aidl/android/hardware/radio/data/IRadioDataResponse.h>
-#include <aidl/android/hardware/radio/ims/IRadioImsResponse.h>
#include <aidl/android/hardware/radio/messaging/IRadioMessagingResponse.h>
#include <aidl/android/hardware/radio/modem/IRadioModemResponse.h>
#include <aidl/android/hardware/radio/network/IRadioNetworkResponse.h>
@@ -50,9 +49,6 @@
GuaranteedCallback<::aidl::android::hardware::radio::voice::IRadioVoiceResponse,
::aidl::android::hardware::radio::voice::IRadioVoiceResponseDefault>
mVoiceCb;
- GuaranteedCallback<::aidl::android::hardware::radio::ims::IRadioImsResponse,
- ::aidl::android::hardware::radio::ims::IRadioImsResponseDefault>
- mImsCb;
// IRadioResponse @ 1.0
Return<void> getIccCardStatusResponse(const V1_0::RadioResponseInfo& info,
@@ -444,8 +440,6 @@
std::shared_ptr<::aidl::android::hardware::radio::sim::IRadioSimResponse> simCb);
void setResponseFunction(
std::shared_ptr<::aidl::android::hardware::radio::voice::IRadioVoiceResponse> voiceCb);
- void setResponseFunction(
- std::shared_ptr<::aidl::android::hardware::radio::ims::IRadioImsResponse> imsCb);
std::shared_ptr<::aidl::android::hardware::radio::data::IRadioDataResponse> dataCb();
std::shared_ptr<::aidl::android::hardware::radio::messaging::IRadioMessagingResponse>
@@ -454,7 +448,6 @@
std::shared_ptr<::aidl::android::hardware::radio::network::IRadioNetworkResponse> networkCb();
std::shared_ptr<::aidl::android::hardware::radio::sim::IRadioSimResponse> simCb();
std::shared_ptr<::aidl::android::hardware::radio::voice::IRadioVoiceResponse> voiceCb();
- std::shared_ptr<::aidl::android::hardware::radio::ims::IRadioImsResponse> imsCb();
};
} // namespace android::hardware::radio::compat
diff --git a/radio/aidl/compat/service/Android.bp b/radio/aidl/compat/service/Android.bp
index d16773e..4dbaef4 100644
--- a/radio/aidl/compat/service/Android.bp
+++ b/radio/aidl/compat/service/Android.bp
@@ -40,7 +40,6 @@
"android.hardware.radio.config@1.2",
"android.hardware.radio.config@1.3",
"android.hardware.radio.data-V1-ndk",
- "android.hardware.radio.ims-V1-ndk",
"android.hardware.radio.messaging-V1-ndk",
"android.hardware.radio.modem-V1-ndk",
"android.hardware.radio.network-V2-ndk",