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

Commit 895fc96b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 170dc1cc 92038123

core/java/android/hardware/usb/UsbManager.java

+1 −1
Original line number Diff line number Diff line
@@ -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,

core/java/android/hardware/usb/UsbPortStatus.java

+2 −2
Original line number Diff line number Diff line
@@ -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,