diff options
| author | 2023-03-21 18:03:32 +0000 | |
|---|---|---|
| committer | 2023-03-21 18:03:32 +0000 | |
| commit | 70a7cec8fe4a9fdd31f9db13ed18aaad41d1a2b7 (patch) | |
| tree | f8864cd7079222c5a9aa49d84bb428d9fafbee18 | |
| parent | c4ddd87651fac437bbc5d4b8b0baa069705c9d17 (diff) | |
| parent | e2f84d355b734366fc2a4562432f1750a301ca8b (diff) | |
Merge "Fix include path in AHardwareBuffer" am: 50be49ca0b am: 75a2f6acb6 am: e2f84d355b
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2498355
Change-Id: I96ab75dab0dd780a0b5b329a8636e3550bd30778
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libs/nativewindow/AHardwareBuffer.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libs/nativewindow/AHardwareBuffer.cpp b/libs/nativewindow/AHardwareBuffer.cpp index cf927dba7a..80607055ed 100644 --- a/libs/nativewindow/AHardwareBuffer.cpp +++ b/libs/nativewindow/AHardwareBuffer.cpp @@ -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); } // ---------------------------------------------------------------------------- |