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

Commit 50be49ca authored by Xiao Huang's avatar Xiao Huang Committed by Gerrit Code Review
Browse files

Merge "Fix include path in AHardwareBuffer"

parents 58596619 527564c7
Loading
Loading
Loading
Loading
+3 −5
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@

#include <android/hardware_buffer.h>
#include <android/hardware_buffer_aidl.h>
#include <android/binder_libbinder.h>
#include <vndk/hardware_buffer.h>

#include <errno.h>
@@ -34,9 +35,6 @@
#include <android/hardware/graphics/common/1.1/types.h>
#include <aidl/android/hardware/graphics/common/PixelFormat.h>

// TODO: Better way to handle this
#include "../binder/ndk/parcel_internal.h"

static constexpr int kFdBufferSize = 128 * sizeof(int);  // 128 ints

using namespace android;
@@ -421,7 +419,7 @@ binder_status_t AHardwareBuffer_readFromParcel(const AParcel* _Nonnull parcel,
        AHardwareBuffer* _Nullable* _Nonnull outBuffer) {
    if (!parcel || !outBuffer) return STATUS_BAD_VALUE;
    auto buffer = sp<GraphicBuffer>::make();
    status_t status = parcel->get()->read(*buffer);
    status_t status = AParcel_viewPlatformParcel(parcel)->read(*buffer);
    if (status != STATUS_OK) return status;
    *outBuffer = AHardwareBuffer_from_GraphicBuffer(buffer.get());
    AHardwareBuffer_acquire(*outBuffer);
@@ -433,7 +431,7 @@ binder_status_t AHardwareBuffer_writeToParcel(const AHardwareBuffer* _Nonnull bu
    const GraphicBuffer* gb = AHardwareBuffer_to_GraphicBuffer(buffer);
    if (!gb) return STATUS_BAD_VALUE;
    if (!parcel) return STATUS_BAD_VALUE;
    return parcel->get()->write(*gb);
    return AParcel_viewPlatformParcel(parcel)->write(*gb);
}

// ----------------------------------------------------------------------------