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

Commit b2864219 authored by Devin Moore's avatar Devin Moore Committed by Automerger Merge Worker
Browse files

Merge "Clean up android.hardware.common types" am: c26ba2dd am: bcf7751d 

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

Change-Id: Ia4352e919f18876c5e7294c3f69f46c923f82776
parents 1790d8c3 bcf7751d

common/aidl/aidl_api/android.hardware.common/current/android/hardware/common/GrantorDescriptor.aidl

+0 −2
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ 
package android.hardware.common;

@VintfStability

parcelable GrantorDescriptor {

  int flags;

  int fdIndex;

  int offset;

  long extent;

}

common/aidl/android/hardware/common/GrantorDescriptor.aidl

+9 −2
Original line number Diff line number Diff line
@@ -16,10 +16,17 @@ 


package android.hardware.common;



/*

 * Included in MQDescriptor, for use with libfmq.

 */

@VintfStability

parcelable GrantorDescriptor {

    int flags;

    int fdIndex;

    /*

     * The offset of this descriptor in the shared memory in bytes.

     */

    int offset;

    /*

     * The size of this descriptor in bytes.

     */

    long extent;

}

common/aidl/android/hardware/common/MQDescriptor.aidl

+5 −0
Original line number Diff line number Diff line
@@ -18,6 +18,11 @@ package android.hardware.common; 


import android.hardware.common.GrantorDescriptor;



/*

 * For use with libfmq. This is created from an instance of AidlMessageQueue,

 * and is used to pass information required to create another instance of that

 * queue for fast communication.

 */

@VintfStability

parcelable MQDescriptor {

    /*