From 80345e908e5eddeabe6ba8f7cb0e1ff4c3dc345c Mon Sep 17 00:00:00 2001 From: Sungtak Lee Date: Sun, 26 Nov 2023 22:52:25 +0000 Subject: [PATCH] media.c2 aidl: handle the case of fence being invalid Bug: 254050314 Test: m Change-Id: I6eed49119de96326324f901fd99d20ab605b92a0 --- .../android/hardware/media/c2/IGraphicBufferAllocator.aidl | 2 +- .../aidl/android/hardware/media/c2/IGraphicBufferAllocator.aidl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/IGraphicBufferAllocator.aidl b/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/IGraphicBufferAllocator.aidl index 3e460ddb62..e13ba1f2aa 100644 --- a/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/IGraphicBufferAllocator.aidl +++ b/media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/IGraphicBufferAllocator.aidl @@ -39,7 +39,7 @@ interface IGraphicBufferAllocator { ParcelFileDescriptor getWaitableFd(); parcelable Allocation { android.hardware.HardwareBuffer buffer; - ParcelFileDescriptor fence; + @nullable ParcelFileDescriptor fence; } parcelable Description { int width; diff --git a/media/c2/aidl/android/hardware/media/c2/IGraphicBufferAllocator.aidl b/media/c2/aidl/android/hardware/media/c2/IGraphicBufferAllocator.aidl index 49c4ea4240..1710242609 100644 --- a/media/c2/aidl/android/hardware/media/c2/IGraphicBufferAllocator.aidl +++ b/media/c2/aidl/android/hardware/media/c2/IGraphicBufferAllocator.aidl @@ -35,7 +35,7 @@ interface IGraphicBufferAllocator { */ parcelable Allocation { HardwareBuffer buffer; - ParcelFileDescriptor fence; + @nullable ParcelFileDescriptor fence; } /**