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

Commit 3d11f23f authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge changes from topic "usage-setting-hal" am: 93292669 am: 9d45ea11 am: 82e0f6a9 

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

Change-Id: Ica608fed4831e43727c24584778964b485c17410
parents 66cf437c 82e0f6a9

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

+4 −0
Original line number Diff line number Diff line
@@ -88,6 +88,10 @@ class RadioNetwork : public RadioCompatBase, 
    ::ndk::ScopedAStatus stopNetworkScan(int32_t serial) override;

    ::ndk::ScopedAStatus supplyNetworkDepersonalization(int32_t serial,

                                                        const std::string& netPin) override;

    ::ndk::ScopedAStatus setUsageSetting(

            int32_t serial,

            ::aidl::android::hardware::radio::network::UsageSetting usageSetting) override;

    ::ndk::ScopedAStatus getUsageSetting(int32_t serial) override;



  public:

    using RadioCompatBase::RadioCompatBase;

radio/aidl/compat/libradiocompat/network/RadioNetwork.cpp

+15 −0
Original line number Diff line number Diff line
@@ -278,4 +278,19 @@ ScopedAStatus RadioNetwork::supplyNetworkDepersonalization(int32_t ser, const st 
    return ok();

}



// TODO(b/210498497): is there a cleaner way to send a response back to Android, even though these

// methods must never be called?

ScopedAStatus RadioNetwork::setUsageSetting(

        int32_t ser, ::aidl::android::hardware::radio::network::UsageSetting) {

    LOG_CALL << ser;

    LOG(ERROR) << "setUsageSetting is unsupported by HIDL HALs";

    return ok();

}



ScopedAStatus RadioNetwork::getUsageSetting(int32_t ser) {

    LOG_CALL << ser;

    LOG(ERROR) << "getUsageSetting is unsupported by HIDL HALs";

    return ok();

}



}  // namespace android::hardware::radio::compat