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

Commit d13a93ef authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by Automerger Merge Worker
Browse files

Port ID is always 0 for HIDL HAL. am: e807d372 am: 16827ce1 am: 0597996a am: 61834cd2 

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

Change-Id: I62fbe841c9e18b8db012aa449361ced66fada0d1
parents 0f15e74c 61834cd2

radio/aidl/compat/libradiocompat/config/RadioConfig.cpp

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ 
#include "debug.h"

#include "structs.h"



#include "collections.h"



#define RADIO_MODULE "Config"



namespace android::hardware::radio::compat {

radio/aidl/compat/libradiocompat/config/structs.cpp

+4 −7
Original line number Diff line number Diff line
@@ -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) {

radio/aidl/compat/libradiocompat/config/structs.h

+1 −2
Original line number Diff line number Diff line
@@ -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);

radio/aidl/compat/libradiocompat/sim/structs.cpp

+0 −1
Original line number Diff line number Diff line
@@ -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},

    };

}