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

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

Merge "libbinder: BBinder::attachObject abort on OOM" am: aaadb20e am: 92390fc1 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1749082

Change-Id: Icf3428d1266b3f81f9af17768982281804d2faa9
parents f8ca5734 92390fc1

libs/binder/Binder.cpp

+1 −1
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ status_t BBinder::dump(int /*fd*/, const Vector<String16>& /*args*/) 
void* BBinder::attachObject(const void* objectID, void* object, void* cleanupCookie,

                            object_cleanup_func func) {

    Extras* e = getOrCreateExtras();

    if (!e) return nullptr; // out of memory

    LOG_ALWAYS_FATAL_IF(!e, "no memory");



    AutoMutex _l(e->mLock);

    return e->mObjects.attach(objectID, object, cleanupCookie, func);