Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "usb: Remove IntDef flag when it isn't a flag"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-12-03 11:03:08 +00:00
committed by Android (Google) Code Review
parent 170dc1ccdd 920381237f
commit 895fc96bc7
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/hardware/usb/UsbManager.java
View File

@@ -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,

4
core/java/android/hardware/usb/UsbPortStatus.java
View File

@@ -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,