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

Commit 12852dea authored by Valerie Hau's avatar Valerie Hau Committed by Automerger Merge Worker
Browse files

Merge "Check for no error in getting planeLayout in lock" into rvc-dev am:... 

Merge "Check for no error in getting planeLayout in lock" into rvc-dev am: 06e0cee7 am: e6cc5449

Change-Id: I29a384e7bf07a0941c329cc61d72fc71603b7f2a
parents eaefd4d8 e6cc5449

libs/ui/Gralloc4.cpp

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ status_t Gralloc4Mapper::lock(buffer_handle_t bufferHandle, uint64_t usage, cons 
    std::vector<ui::PlaneLayout> planeLayouts;

    status_t err = getPlaneLayouts(bufferHandle, &planeLayouts);



    if (err != NO_ERROR && !planeLayouts.empty()) {

    if (err == NO_ERROR && !planeLayouts.empty()) {

        if (outBytesPerPixel) {

            int32_t bitsPerPixel = planeLayouts.front().sampleIncrementInBits;

            for (const auto& planeLayout : planeLayouts) {