Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e10f318 authored by Muralidhar Reddy Mule's avatar Muralidhar Reddy Mule Committed by Automerger Merge Worker
Browse files

Merge "Add cuttlefish support for iccCloseLogicalChannelWithSessionInfo HAl... 

Merge "Add cuttlefish support for iccCloseLogicalChannelWithSessionInfo HAl 2.1 API" into udc-dev am: be44d36e

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/22648201



Change-Id: I3812856246f91545ee074b26e6647486bd614827
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7d0001c4 be44d36e

radio/aidl/compat/libradiocompat/include/libradiocompat/RadioSim.h

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ class RadioSim : public RadioCompatBase, public aidl::android::hardware::radio:: 
    ::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 @@ class RadioSim : public RadioCompatBase, public aidl::android::hardware::radio:: 


  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;