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

Commit 16827ce1 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 

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

Change-Id: I1349c5232478512f494360e45d7929fda2af2c27
parents edd5a0b1 e807d372

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

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

#include "debug.h"

#include "structs.h"

#include "structs.h"





#include "collections.h"



#define RADIO_MODULE "Config"

#define RADIO_MODULE "Config"





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

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

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

+4 −7
Original line number Original line Diff line number Diff line
@@ -24,14 +24,11 @@ namespace android::hardware::radio::compat { 




namespace aidl = ::aidl::android::hardware::radio::config;

namespace aidl = ::aidl::android::hardware::radio::config;





hidl_vec<uint32_t> toHidl(const std::vector<aidl::SlotPortMapping>& slotMap) {

uint32_t toHidl(const aidl::SlotPortMapping& slotPortMapping) {

    hidl_vec<uint32_t> out(slotMap.size());

    if (slotPortMapping.portId != 0) {

    for (const auto& el : slotMap) {

        LOG(ERROR) << "Port ID " << slotPortMapping.portId << " != 0 not supported by HIDL HAL";

        CHECK_GE(el.portId, 0);

        CHECK_LT(static_cast<size_t>(el.portId), out.size());

        out[el.portId] = el.physicalSlotId;

    }

    }

    return out;

    return slotPortMapping.physicalSlotId;

}

}





aidl::SimSlotStatus toAidl(const config::V1_0::SimSlotStatus& sst) {

aidl::SimSlotStatus toAidl(const config::V1_0::SimSlotStatus& sst) {

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

+1 −2
Original line number Original line Diff line number Diff line
@@ -23,8 +23,7 @@ 




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

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





hidl_vec<uint32_t>  //

uint32_t toHidl(const aidl::android::hardware::radio::config::SlotPortMapping& slotPortMapping);

toHidl(const std::vector<aidl::android::hardware::radio::config::SlotPortMapping>& slotMap);





aidl::android::hardware::radio::config::SimSlotStatus  //

aidl::android::hardware::radio::config::SimSlotStatus  //

toAidl(const config::V1_0::SimSlotStatus& sst);

toAidl(const config::V1_0::SimSlotStatus& sst);

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

+0 −1
Original line number Original line Diff line number Diff line
@@ -173,7 +173,6 @@ aidl::CardStatus toAidl(const V1_5::CardStatus& status) { 
            .atr = status.base.base.atr,

            .atr = status.base.base.atr,

            .iccid = status.base.base.iccid,

            .iccid = status.base.base.iccid,

            .eid = status.base.eid,

            .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},

            .slotMap = {static_cast<int32_t>(status.base.base.physicalSlotId), 0},

    };

    };

}

}