Merge "media.c2 aidl: handle the case of fence being invalid" into main am: cf5c2cf45a am: e12f4b7664 am: 7b8f40ad23

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2845122

Change-Id: I2c7b33f0db1b4d5364dda046dee0e843c3a44821
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sungtak Lee
2023-11-27 19:45:44 +00:00
committed by Automerger Merge Worker
2 changed files with 2 additions and 2 deletions

View File

@@ -39,7 +39,7 @@ interface IGraphicBufferAllocator {
ParcelFileDescriptor getWaitableFd();
parcelable Allocation {
android.hardware.HardwareBuffer buffer;
ParcelFileDescriptor fence;
@nullable ParcelFileDescriptor fence;
}
parcelable Description {
int width;

View File

@@ -35,7 +35,7 @@ interface IGraphicBufferAllocator {
*/
parcelable Allocation {
HardwareBuffer buffer;
ParcelFileDescriptor fence;
@nullable ParcelFileDescriptor fence;
}
/**