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

Commit 01cc03b4 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 am: c796aba2

Change-Id: I4fa16f5438fa90cb09a29d1ccbdbfcd0e70757d2
parents 5bd38262 c796aba2

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) {