From 920381237f6c24722b113af56e83014d33443c29 Mon Sep 17 00:00:00 2001
From: raychi <raychi@google.com>
Date: Wed, 2 Dec 2020 16:29:35 +0800
Subject: [PATCH] usb: Remove IntDef flag when it isn't a flag

Some Int Def annotations were marked with `flag=true` by mistake.
This commit will remove the definition so that the flag
will be marked as false by default.

Bug: 174239412
Test: full build pass
Change-Id: I32328d76699e396c53dfc62768b2cd24ab48cabd
---
 core/java/android/hardware/usb/UsbManager.java    | 2 +-
 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 aac57fe88b17d..c28bab7f643fe 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 43c418e2cb268..bb7aff651b3da 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,