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

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

Merge "fix validateBufferDescriptorInfo error when usage bits were 32-bits" am: 61ba79e8 

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



Change-Id: Ifb25e0f116d64b902db49c56890504466c3194ba
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c40390f1 61ba79e8

libs/ui/GraphicBuffer.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -465,7 +465,7 @@ status_t GraphicBuffer::unflatten(void const*& buffer, size_t& size, int const*& 
        if (flattenWordCount == 13) {

        if (flattenWordCount == 13) {

            usage = (uint64_t(buf[12]) << 32) | uint32_t(buf[6]);

            usage = (uint64_t(buf[12]) << 32) | uint32_t(buf[6]);

        } else {

        } else {

            usage = uint64_t(usage_deprecated);

            usage = uint64_t(ANDROID_NATIVE_UNSIGNED_CAST(usage_deprecated));

        }

        }

        native_handle* h =

        native_handle* h =

                native_handle_create(static_cast<int>(numFds), static_cast<int>(numInts));

                native_handle_create(static_cast<int>(numFds), static_cast<int>(numInts));