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

Commit 17eb9236 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6019291 from edc2d69c to rvc-release 

Change-Id: I23c0ec4b93c6a511b2d0caac291d87e994e56739
parents bed006f6 edc2d69c

cmds/servicemanager/ServiceManager.cpp

+9 −1
Original line number Diff line number Diff line
@@ -68,7 +68,15 @@ static bool meetsDeclarationRequirements(const sp<IBinder>& binder, const std::s 
}

#endif  // !VENDORSERVICEMANAGER



ServiceManager::ServiceManager(std::unique_ptr<Access>&& access) : mAccess(std::move(access)) {}

ServiceManager::ServiceManager(std::unique_ptr<Access>&& access) : mAccess(std::move(access)) {

#ifndef VENDORSERVICEMANAGER

    // can process these at any times, don't want to delay first VINTF client

    std::thread([] {

        vintf::VintfObject::GetDeviceHalManifest();

        vintf::VintfObject::GetFrameworkHalManifest();

    }).detach();

#endif  // !VENDORSERVICEMANAGER

}

ServiceManager::~ServiceManager() {

    // this should only happen in tests

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)

libs/nativewindow/Android.bp

+5 −0
Original line number Diff line number Diff line
@@ -85,6 +85,11 @@ cc_library { 
    export_header_lib_headers: [

        "libnativebase_headers",

    ],



    stubs: {

        symbol_file: "libnativewindow.map.txt",

        versions: ["29"],

    },

}



llndk_library {

libs/nativewindow/libnativewindow.map.txt

+2 −2
Original line number Diff line number Diff line
@@ -2,9 +2,9 @@ LIBNATIVEWINDOW { 
  global:

    AHardwareBuffer_acquire;

    AHardwareBuffer_allocate;

    AHardwareBuffer_createFromHandle; # llndk

    AHardwareBuffer_createFromHandle; # llndk # apex

    AHardwareBuffer_describe;

    AHardwareBuffer_getNativeHandle; # llndk

    AHardwareBuffer_getNativeHandle; # llndk # apex

    AHardwareBuffer_isSupported; # introduced=29

    AHardwareBuffer_lock;

    AHardwareBuffer_lockAndGetInfo; # introduced=29