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

Commit eef45460 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use more inclusive language for #inclusivefixit" am: 71db3173 am:... 

Merge "Use more inclusive language for #inclusivefixit" am: 71db3173 am: 069fa34e am: 1e3020b1

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1373465

Change-Id: I05f4bf84a424c51232192d9c56d990594f69c35d
parents b8c89334 1e3020b1

trusty/gatekeeper/trusty_gatekeeper.cpp

+3 −3
Original line number Diff line number Diff line
@@ -56,9 +56,9 @@ TrustyGateKeeperDevice::~TrustyGateKeeperDevice() { 


SizedBuffer hidl_vec2sized_buffer(const hidl_vec<uint8_t>& vec) {

    if (vec.size() == 0 || vec.size() > std::numeric_limits<uint32_t>::max()) return {};

    auto dummy = new uint8_t[vec.size()];

    std::copy(vec.begin(), vec.end(), dummy);

    return {dummy, static_cast<uint32_t>(vec.size())};

    auto buffer = new uint8_t[vec.size()];

    std::copy(vec.begin(), vec.end(), buffer);

    return {buffer, static_cast<uint32_t>(vec.size())};

}



Return<void> TrustyGateKeeperDevice::enroll(uint32_t uid,