Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b8f40ad authored by Sungtak Lee's avatar Sungtak Lee Committed by Automerger Merge Worker
Browse files

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

Merge "media.c2 aidl: handle the case of fence being invalid" into main am: cf5c2cf4 am: e12f4b76

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



Change-Id: I1d76494caa7d6765d3ed8d93646ec839a7825aeb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b191f994 e12f4b76

media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/IGraphicBufferAllocator.aidl

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ interface IGraphicBufferAllocator { 
  ParcelFileDescriptor getWaitableFd();

  parcelable Allocation {

    android.hardware.HardwareBuffer buffer;

    ParcelFileDescriptor fence;

    @nullable ParcelFileDescriptor fence;

  }

  parcelable Description {

    int width;

media/c2/aidl/android/hardware/media/c2/IGraphicBufferAllocator.aidl

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ interface IGraphicBufferAllocator { 
     */

    parcelable Allocation {

        HardwareBuffer buffer;

        ParcelFileDescriptor fence;

        @nullable ParcelFileDescriptor fence;

    }



    /**