From 5dad8ffb50469b855aacb82c4e85d12387b3c02a Mon Sep 17 00:00:00 2001 From: Nathan Harold Date: Mon, 13 Dec 2021 11:15:38 -0800 Subject: [PATCH] UsageSetting Compat Stubs Bug: 210023167 Test: make android.hardware.radio-library.compat Merged-In: Iea5e016878f375608a167ad0fdc232fd2e743fa6 Change-Id: Iea5e016878f375608a167ad0fdc232fd2e743fa6 (cherry picked from commit 055c02fcfb27d75b8aaf22a8a677296b767fa1d0) --- .../include/libradiocompat/RadioNetwork.h | 4 ++++ .../libradiocompat/network/RadioNetwork.cpp | 15 +++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioNetwork.h b/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioNetwork.h index c776fd1f09..09ae240dbc 100644 --- a/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioNetwork.h +++ b/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioNetwork.h @@ -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; diff --git a/radio/aidl/compat/libradiocompat/network/RadioNetwork.cpp b/radio/aidl/compat/libradiocompat/network/RadioNetwork.cpp index af0bc4619f..5fa1cf5da3 100644 --- a/radio/aidl/compat/libradiocompat/network/RadioNetwork.cpp +++ b/radio/aidl/compat/libradiocompat/network/RadioNetwork.cpp @@ -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