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

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

Merge "nativewindow: report errors on error to allocate a handle" am: 04a1d0dd am: 2bb81b0c 

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

Change-Id: I2af80fbe004bce834aa6b3f4bf802c52b70a9f69
parents 754a3f7d 2bb81b0c

libs/nativewindow/AHardwareBuffer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -51,13 +51,13 @@ int AHardwareBuffer_allocate(const AHardwareBuffer_Desc* desc, AHardwareBuffer** 
            std::string("AHardwareBuffer pid [") + std::to_string(getpid()) + "]"));



    status_t err = gbuffer->initCheck();

    if (err != 0 || gbuffer->handle == 0) {

    if (err != 0 || gbuffer->handle == nullptr) {

        if (err == NO_MEMORY) {

            GraphicBuffer::dumpAllocationsToSystemLog();

        }

        ALOGE("GraphicBuffer(w=%u, h=%u, lc=%u) failed (%s), handle=%p",

                desc->width, desc->height, desc->layers, strerror(-err), gbuffer->handle);

        return err;

        return err == 0 ? UNKNOWN_ERROR : err;

    }



    *outBuffer = AHardwareBuffer_from_GraphicBuffer(gbuffer.get());