| commit | e12f4b76649bc8f6ee8aff3135abbb5d7f017850 | [log] [tgz] |
|---|---|---|
| author | Sungtak Lee <taklee@google.com> | Mon Nov 27 18:44:53 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Nov 27 18:44:53 2023 +0000 |
| tree | 12dbe433e477576c85ce62d19577ed59e5ba6144 | |
| parent | 4ea954c72150826c3c68250d3f6c9a2dcc706796 [diff] | |
| parent | cf5c2cf45a537c88fe399d37fbd0e0df825a5db8 [diff] |
Merge "media.c2 aidl: handle the case of fence being invalid" into main am: cf5c2cf45a Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2845122 Change-Id: I9d226bdfc6570f3799b3e640eaffa05387feba1b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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 3e460dd..e13ba1f 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 @@ 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 49c4ea4..1710242 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 @@ */ parcelable Allocation { HardwareBuffer buffer; - ParcelFileDescriptor fence; + @nullable ParcelFileDescriptor fence; } /**