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

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

Merge "Use NativeHandle in MQDescriptor instead of ParcelFileDescriptor" am: 1f00c21c 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8db6eb1f7b7d85791719f399897baf231f8d8871
parents d3840e5d 1f00c21c

common/fmq/aidl/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -9,6 +9,9 @@ aidl_interface { 
    srcs: [

        "android/hardware/common/fmq/*.aidl",

    ],

    imports: [

        "android.hardware.common",

    ],

    stability: "vintf",

    backend: {

        java: {

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

+8 −6
Original line number Diff line number Diff line
@@ -2,13 +2,14 @@ 
// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //

///////////////////////////////////////////////////////////////////////////////



// This file is a snapshot of an AIDL interface (or parcelable). Do not try to

// edit this file. It looks like you are doing that because you have modified

// an AIDL interface in a backward-incompatible way, e.g., deleting a function

// from an interface or a field from a parcelable and it broke the build. That

// breakage is intended.

// This file is a snapshot of an AIDL file. Do not edit it manually. There are

// two cases:

// 1). this is a frozen version file - do not edit this in any case.

// 2). this is a 'current' file. If you make a backwards compatible change to

//     the interface (from the latest frozen version), the build system will

//     prompt you to update this file with `m <name>-update-api`.

//

// You must not make a backward incompatible changes to the AIDL files built

// You must not make a backward incompatible change to any AIDL file built

// with the aidl_interface module type with versions property set. The module

// type is used to build AIDL files in a way that they can be used across

// independently updatable components of the system. If a device is shipped
@@ -18,6 +19,7 @@ 
package android.hardware.common.fmq;

@VintfStability

parcelable GrantorDescriptor {

  int fdIndex;

  int offset;

  long extent;

}

common/fmq/aidl/aidl_api/android.hardware.common.fmq/current/android/hardware/common/fmq/MQDescriptor.aidl

+8 −7
Original line number Diff line number Diff line
@@ -2,13 +2,14 @@ 
// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //

///////////////////////////////////////////////////////////////////////////////



// This file is a snapshot of an AIDL interface (or parcelable). Do not try to

// edit this file. It looks like you are doing that because you have modified

// an AIDL interface in a backward-incompatible way, e.g., deleting a function

// from an interface or a field from a parcelable and it broke the build. That

// breakage is intended.

// This file is a snapshot of an AIDL file. Do not edit it manually. There are

// two cases:

// 1). this is a frozen version file - do not edit this in any case.

// 2). this is a 'current' file. If you make a backwards compatible change to

//     the interface (from the latest frozen version), the build system will

//     prompt you to update this file with `m <name>-update-api`.

//

// You must not make a backward incompatible changes to the AIDL files built

// You must not make a backward incompatible change to any AIDL file built

// with the aidl_interface module type with versions property set. The module

// type is used to build AIDL files in a way that they can be used across

// independently updatable components of the system. If a device is shipped
@@ -19,7 +20,7 @@ package android.hardware.common.fmq; 
@VintfStability

parcelable MQDescriptor {

  android.hardware.common.fmq.GrantorDescriptor[] grantors;

  ParcelFileDescriptor fileDescriptor;

  android.hardware.common.NativeHandle handle;

  int quantum;

  int flags;

}

common/fmq/aidl/aidl_api/android.hardware.common.fmq/current/android/hardware/common/fmq/SynchronizedReadWrite.aidl

+7 −6
Original line number Diff line number Diff line
@@ -2,13 +2,14 @@ 
// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //

///////////////////////////////////////////////////////////////////////////////



// This file is a snapshot of an AIDL interface (or parcelable). Do not try to

// edit this file. It looks like you are doing that because you have modified

// an AIDL interface in a backward-incompatible way, e.g., deleting a function

// from an interface or a field from a parcelable and it broke the build. That

// breakage is intended.

// This file is a snapshot of an AIDL file. Do not edit it manually. There are

// two cases:

// 1). this is a frozen version file - do not edit this in any case.

// 2). this is a 'current' file. If you make a backwards compatible change to

//     the interface (from the latest frozen version), the build system will

//     prompt you to update this file with `m <name>-update-api`.

//

// You must not make a backward incompatible changes to the AIDL files built

// You must not make a backward incompatible change to any AIDL file built

// with the aidl_interface module type with versions property set. The module

// type is used to build AIDL files in a way that they can be used across

// independently updatable components of the system. If a device is shipped

common/fmq/aidl/aidl_api/android.hardware.common.fmq/current/android/hardware/common/fmq/UnsynchronizedWrite.aidl

+7 −6
Original line number Diff line number Diff line
@@ -2,13 +2,14 @@ 
// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //

///////////////////////////////////////////////////////////////////////////////



// This file is a snapshot of an AIDL interface (or parcelable). Do not try to

// edit this file. It looks like you are doing that because you have modified

// an AIDL interface in a backward-incompatible way, e.g., deleting a function

// from an interface or a field from a parcelable and it broke the build. That

// breakage is intended.

// This file is a snapshot of an AIDL file. Do not edit it manually. There are

// two cases:

// 1). this is a frozen version file - do not edit this in any case.

// 2). this is a 'current' file. If you make a backwards compatible change to

//     the interface (from the latest frozen version), the build system will

//     prompt you to update this file with `m <name>-update-api`.

//

// You must not make a backward incompatible changes to the AIDL files built

// You must not make a backward incompatible change to any AIDL file built

// with the aidl_interface module type with versions property set. The module

// type is used to build AIDL files in a way that they can be used across

// independently updatable components of the system. If a device is shipped