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

Commit f84e1764 authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge "Note confusion-causing breaks in HIDL convention." am: 27b09c2c

am: a8b9438a

Change-Id: Ia6e5908a3ca6da4c487ef8f5d87d04804cb655b3
parents 11e3afa1 a8b9438a
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -392,3 +392,5 @@ da33234403ff5d60f3473711917b9948e6484a4260b5247acdafb111193a9de2 android.hardwar
1d4a5776614c08b5d794a5ec5ab04697260cbd4b3441d5935cd53ee71d19da02 android.hardware.radio@1.0::IRadioResponse
271187e261b30c01a33011aea257c07a2d2f05b72943ebee89e973e997849973 android.hardware.radio@1.0::types
1d19720d4fd38b1095f0f555a4bd92b3b12c9b1d0f560b0e9a474cd6dcc20db6 android.hardware.radio@1.2::IRadio
1722ad002317b1fae1400de709e90f442d94ef22864e05f7a12af48c32e8edc8 android.hardware.usb@1.1::types
29c8da7a13c40d488f569c812441d5754ee45bdcdb8ce6564f524b708d10a057 android.hardware.vibrator@1.1::types
+4 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ package android.hardware.usb@1.1;

import android.hardware.usb@1.0;

// NOTE: suffix '_1_1' is for legacy ABI compatibility. It cannot be
// changed to 'PortMode' which the convention dictates.
@export
enum PortMode_1_1 : PortMode {
    /*
@@ -37,6 +39,8 @@ enum PortMode_1_1 : PortMode {
 * Used as the container to report data back to the caller.
 * Represents the current connection status of a single USB port.
 */
// NOTE: suffix '_1_1' is for legacy ABI compatibility. It cannot be
// changed to 'PortStatus' which the convention dictates.
struct PortStatus_1_1 {
    /*
     * The supportedModes and the currentMode fields of the status
+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ package android.hardware.vibrator@1.1;

import @1.0::Effect;

// NOTE: suffix '_1_1' is for legacy ABI compatibility. It cannot be
// changed to 'Effect' which the convention dictates.
@export
enum Effect_1_1 : @1.0::Effect {
    /**