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

Commit dc1f56b4 authored by Xiao Huang's avatar Xiao Huang Committed by Automerger Merge Worker
Browse files

Merge "Fix include path in AHardwareBuffer" am: 50be49ca am: 75a2f6ac am:... 

Merge "Fix include path in AHardwareBuffer" am: 50be49ca am: 75a2f6ac am: e2f84d35 am: 70a7cec8

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



Change-Id: Ie5b1c23e4b763b6ced595b5d5ce7adb77f1fd82a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5abcceaf 70a7cec8

libs/nativewindow/AHardwareBuffer.cpp

+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);

}



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