Merge "media.c2 aidl: handle the case of fence being invalid" into main am: cf5c2cf45a
am: e12f4b7664
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2845122 Change-Id: I1d76494caa7d6765d3ed8d93646ec839a7825aeb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
7b8f40ad23
2 changed files with 2 additions and 2 deletions
|
@ -39,7 +39,7 @@ interface IGraphicBufferAllocator {
|
|||
ParcelFileDescriptor getWaitableFd();
|
||||
parcelable Allocation {
|
||||
android.hardware.HardwareBuffer buffer;
|
||||
ParcelFileDescriptor fence;
|
||||
@nullable ParcelFileDescriptor fence;
|
||||
}
|
||||
parcelable Description {
|
||||
int width;
|
||||
|
|
|
@ -35,7 +35,7 @@ interface IGraphicBufferAllocator {
|
|||
*/
|
||||
parcelable Allocation {
|
||||
HardwareBuffer buffer;
|
||||
ParcelFileDescriptor fence;
|
||||
@nullable ParcelFileDescriptor fence;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in a new issue