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

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

Merge changes from topic...

Merge changes from topic "revert-1433252-revert-1431616-thirtytwo-QKCUUIXLZL-QJYJJALHBY" am: 51dc008b am: 359970ca am: e30e9d9d am: 022d9abf am: 172c490d

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

Change-Id: Ie30e61029ba87e0c0f5cedc18683891502ae5b05
parents 3a79b5f5 172c490d
Loading
Loading
Loading
Loading
+22 −0
Original line number Diff line number Diff line
///////////////////////////////////////////////////////////////////////////////
// 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.
//
// You must not make a backward incompatible changes to the AIDL files 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
// with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules.

package android.hardware.common;
@VintfStability
enum SynchronizedReadWrite {
  EMPTY = 0,
}
+22 −0
Original line number Diff line number Diff line
///////////////////////////////////////////////////////////////////////////////
// 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.
//
// You must not make a backward incompatible changes to the AIDL files 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
// with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules.

package android.hardware.common;
@VintfStability
enum UnsynchronizedWrite {
  EMPTY = 0,
}
+4 −1
Original line number Diff line number Diff line
@@ -22,9 +22,12 @@ 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.
 * T - is used to specify the type of the payload
 * Flavor - is used to specify the type of the queue using
 * android.hardware.common.SynchronizedReadWrite or UnsynchronizedWrite
 */
@VintfStability
parcelable MQDescriptor {
parcelable MQDescriptor<T, Flavor> {
    /*
     * Describes each of the grantors for the message queue. They are used to
     * get the readptr, writeptr, dataptr, and the optional EventFlag word
+27 −0
Original line number Diff line number Diff line
/*
 * Copyright 2020 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package android.hardware.common;

/*
 * For use with android.hardware.common.MQDescriptor to specify which type of
 * queue to use. SynchronizedReadWrite is single reader, single writer, with no
 * overflow. All messages written need to be read.
 */
@VintfStability
enum SynchronizedReadWrite {
    EMPTY,
}
+27 −0
Original line number Diff line number Diff line
/*
 * Copyright 2020 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package android.hardware.common;

/*
 * For use with android.hardware.common.MQDescriptor to specify which type of
 * queue to use. UnsynchronizedWrite is single writer, multiple reader, with
 * overflow. If messages are not read fast enough, they can be overwritten.
 */
@VintfStability
enum UnsynchronizedWrite {
    EMPTY,
}