diff options
| author | 2020-12-03 11:03:08 +0000 | |
|---|---|---|
| committer | 2020-12-03 11:03:08 +0000 | |
| commit | 895fc96bc7327ec0e76e13a3b5d9754543d6e4bb (patch) | |
| tree | b3cb3d2dca5ae8732b9bad6d7027cdb796657c7c | |
| parent | 170dc1ccdd8c34e23c6c85dbc7f368b6faf95da4 (diff) | |
| parent | 920381237f6c24722b113af56e83014d33443c29 (diff) | |
Merge "usb: Remove IntDef flag when it isn't a flag"
| -rw-r--r-- | core/java/android/hardware/usb/UsbManager.java | 2 | ||||
| -rw-r--r-- | core/java/android/hardware/usb/UsbPortStatus.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/hardware/usb/UsbManager.java b/core/java/android/hardware/usb/UsbManager.java index aac57fe88b17..c28bab7f643f 100644 --- a/core/java/android/hardware/usb/UsbManager.java +++ b/core/java/android/hardware/usb/UsbManager.java @@ -609,7 +609,7 @@ public class UsbManager { public @interface UsbFunctionMode {} /** @hide */ - @IntDef(flag = true, prefix = { "GADGET_HAL_" }, value = { + @IntDef(prefix = { "GADGET_HAL_" }, value = { GADGET_HAL_NOT_SUPPORTED, GADGET_HAL_V1_0, GADGET_HAL_V1_1, diff --git a/core/java/android/hardware/usb/UsbPortStatus.java b/core/java/android/hardware/usb/UsbPortStatus.java index 43c418e2cb26..bb7aff651b3d 100644 --- a/core/java/android/hardware/usb/UsbPortStatus.java +++ b/core/java/android/hardware/usb/UsbPortStatus.java @@ -202,7 +202,7 @@ public final class UsbPortStatus implements Parcelable { public static final int CONTAMINANT_PROTECTION_DISABLED = android.hardware.usb.V1_2.Constants.ContaminantProtectionStatus.DISABLED; - @IntDef(prefix = { "CONTAMINANT_DETECION_" }, flag = true, value = { + @IntDef(prefix = { "CONTAMINANT_DETECTION_" }, value = { CONTAMINANT_DETECTION_NOT_SUPPORTED, CONTAMINANT_DETECTION_DISABLED, CONTAMINANT_DETECTION_NOT_DETECTED, @@ -221,7 +221,7 @@ public final class UsbPortStatus implements Parcelable { @Retention(RetentionPolicy.SOURCE) @interface ContaminantProtectionStatus{} - @IntDef(prefix = { "MODE_" }, flag = true, value = { + @IntDef(prefix = { "MODE_" }, value = { MODE_NONE, MODE_DFP, MODE_UFP, |