Merge "Add cuttlefish support for iccCloseLogicalChannelWithSessionInfo HAl 2.1 API" into udc-dev am: be44d36ed7
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/22648201
Change-Id: Ib1b48cbcf2164be59e9a82d9970ab32ab95d67e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioSim.h b/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioSim.h
index f12e532..99e4b25 100644
--- a/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioSim.h
+++ b/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioSim.h
@@ -40,7 +40,6 @@
::ndk::ScopedAStatus getImsiForApp(int32_t serial, const std::string& aid) override;
::ndk::ScopedAStatus getSimPhonebookCapacity(int32_t serial) override;
::ndk::ScopedAStatus getSimPhonebookRecords(int32_t serial) override;
- ::ndk::ScopedAStatus iccCloseLogicalChannel(int32_t serial, int32_t channelId) override;
::ndk::ScopedAStatus iccCloseLogicalChannelWithSessionInfo(int32_t serial,
const ::aidl::android::hardware::radio::sim::SessionInfo& recordInfo) override;
::ndk::ScopedAStatus iccIoForApp(
@@ -104,6 +103,7 @@
protected:
std::shared_ptr<::aidl::android::hardware::radio::sim::IRadioSimResponse> respond();
+ ::ndk::ScopedAStatus iccCloseLogicalChannel(int32_t serial, int32_t channelId) override;
public:
using RadioCompatBase::RadioCompatBase;