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

Commit 478572d9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "frameworks: native: fix -Wreorder-init-list"

parents 738f785d 54891cd7

libs/binder/tests/binderLibTest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1034,9 +1034,9 @@ TEST_F(BinderLibTest, BufRejected) { 


    binder_buffer_object obj {

        .hdr = { .type = BINDER_TYPE_PTR },

        .flags = 0,

        .buffer = reinterpret_cast<binder_uintptr_t>((void*)&buf),

        .length = 4,

        .flags = 0,

    };

    data.setDataCapacity(1024);

    // Write a bogus object at offset 0 to get an entry in the offset table

libs/cputimeinstate/cputimeinstate.cpp

+1 −1
Original line number Diff line number Diff line
@@ -397,7 +397,7 @@ bool clearUidTimes(uint32_t uid) { 
        if (deleteMapEntry(gTisMapFd, &key) && errno != ENOENT) return false;

    }



    concurrent_val_t czeros = {.policy = {0}, .active = {0}};

    concurrent_val_t czeros = { .active = {0}, .policy = {0}, };

    std::vector<concurrent_val_t> cvals(gNCpus, czeros);

    for (key.bucket = 0; key.bucket <= (gNCpus - 1) / CPUS_PER_ENTRY; ++key.bucket) {

        if (writeToMapEntry(gConcurrentMapFd, &key, cvals.data(), BPF_EXIST) && errno != ENOENT)