diff options
| author | Tomasz Wasilczyk <twasilczyk@google.com> | 2022-01-06 18:49:17 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-01-06 18:49:17 +0000 |
| commit | d13a93ef9b17b2a24cf241dae6ac33740686fafc (patch) | |
| tree | ecd718ff0c2e06457859d6af5041b5b75c917386 | |
| parent | 0f15e74ce0d42e898aaba4fd342068071d131910 (diff) | |
| parent | 61834cd2376edd93d72afb3ea434c0d75548a2a6 (diff) | |
Port ID is always 0 for HIDL HAL. am: e807d37229 am: 16827ce18b am: 0597996a93 am: 61834cd237
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1937406
Change-Id: I62fbe841c9e18b8db012aa449361ced66fada0d1
4 files changed, 7 insertions, 10 deletions
diff --git a/radio/aidl/compat/libradiocompat/config/RadioConfig.cpp b/radio/aidl/compat/libradiocompat/config/RadioConfig.cpp index 5b22dbe6ca..b45041811d 100644 --- a/radio/aidl/compat/libradiocompat/config/RadioConfig.cpp +++ b/radio/aidl/compat/libradiocompat/config/RadioConfig.cpp @@ -20,6 +20,8 @@ #include "debug.h" #include "structs.h" +#include "collections.h" + #define RADIO_MODULE "Config" namespace android::hardware::radio::compat { diff --git a/radio/aidl/compat/libradiocompat/config/structs.cpp b/radio/aidl/compat/libradiocompat/config/structs.cpp index 9ba56231e2..39ad944c51 100644 --- a/radio/aidl/compat/libradiocompat/config/structs.cpp +++ b/radio/aidl/compat/libradiocompat/config/structs.cpp @@ -24,14 +24,11 @@ namespace android::hardware::radio::compat { namespace aidl = ::aidl::android::hardware::radio::config; -hidl_vec<uint32_t> toHidl(const std::vector<aidl::SlotPortMapping>& slotMap) { - hidl_vec<uint32_t> out(slotMap.size()); - for (const auto& el : slotMap) { - CHECK_GE(el.portId, 0); - CHECK_LT(static_cast<size_t>(el.portId), out.size()); - out[el.portId] = el.physicalSlotId; +uint32_t toHidl(const aidl::SlotPortMapping& slotPortMapping) { + if (slotPortMapping.portId != 0) { + LOG(ERROR) << "Port ID " << slotPortMapping.portId << " != 0 not supported by HIDL HAL"; } - return out; + return slotPortMapping.physicalSlotId; } aidl::SimSlotStatus toAidl(const config::V1_0::SimSlotStatus& sst) { diff --git a/radio/aidl/compat/libradiocompat/config/structs.h b/radio/aidl/compat/libradiocompat/config/structs.h index b8a038588c..6ea4e4a47f 100644 --- a/radio/aidl/compat/libradiocompat/config/structs.h +++ b/radio/aidl/compat/libradiocompat/config/structs.h @@ -23,8 +23,7 @@ namespace android::hardware::radio::compat { -hidl_vec<uint32_t> // -toHidl(const std::vector<aidl::android::hardware::radio::config::SlotPortMapping>& slotMap); +uint32_t toHidl(const aidl::android::hardware::radio::config::SlotPortMapping& slotPortMapping); aidl::android::hardware::radio::config::SimSlotStatus // toAidl(const config::V1_0::SimSlotStatus& sst); diff --git a/radio/aidl/compat/libradiocompat/sim/structs.cpp b/radio/aidl/compat/libradiocompat/sim/structs.cpp index 97a21a1e79..bfbff029df 100644 --- a/radio/aidl/compat/libradiocompat/sim/structs.cpp +++ b/radio/aidl/compat/libradiocompat/sim/structs.cpp @@ -173,7 +173,6 @@ aidl::CardStatus toAidl(const V1_5::CardStatus& status) { .atr = status.base.base.atr, .iccid = status.base.base.iccid, .eid = status.base.eid, - // TODO(b/203699028): we don't know portId here (but we can get it from RadioConfig) .slotMap = {static_cast<int32_t>(status.base.base.physicalSlotId), 0}, }; } |