| commit | 9d45ea1185db7081857943980b235332b12eb3d6 | [log] [tgz] |
|---|---|---|
| author | Sarah Chin <sarahchin@google.com> | Wed Jan 05 20:27:23 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 05 20:27:23 2022 +0000 |
| tree | 1f80d321761500739cc0b3a4675dd66d88aeded1 | |
| parent | b3a2a2bde396058cb3a21179a3e992fb17f83a83 [diff] | |
| parent | 932926691ac7a82b5563ce3c2fa9eb1f69dd1af7 [diff] |
Merge changes from topic "usage-setting-hal" am: 932926691a Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1935057 Change-Id: I82f29cbf4972faf69276428692cc944efb209b02
diff --git a/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioNetwork.h b/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioNetwork.h index c776fd1..09ae240 100644 --- a/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioNetwork.h +++ b/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioNetwork.h
@@ -88,6 +88,10 @@ ::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 af0bc46..5fa1cf5 100644 --- a/radio/aidl/compat/libradiocompat/network/RadioNetwork.cpp +++ b/radio/aidl/compat/libradiocompat/network/RadioNetwork.cpp
@@ -278,4 +278,19 @@ 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