diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2023-06-21 05:04:05 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-06-21 05:04:05 +0000 |
commit | 0ed71237877dc939def29501308731807264b841 (patch) | |
tree | f43190b8a646cad5c1e108181b466e3252a19953 | |
parent | 7a558ab92b27e23395aad5d59a80c731c6566f42 (diff) | |
parent | 3e77c6f37e4f5b7336e123c186de5920936c5c96 (diff) | |
download | base-temp_275386652.tar.gz |
Merge changes I824c99fa,I1ce03549 am: 3e77c6f37etemp_275386652
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2626140
Change-Id: I83085719de501d5c4e9fa583f51095acf045843f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
4 files changed, 3 insertions, 74 deletions
diff --git a/services/usb/java/com/android/server/usb/hal/gadget/UsbGadgetAidl.java b/services/usb/java/com/android/server/usb/hal/gadget/UsbGadgetAidl.java index bdfe60ac07c1..f38ee5cc591a 100644 --- a/services/usb/java/com/android/server/usb/hal/gadget/UsbGadgetAidl.java +++ b/services/usb/java/com/android/server/usb/hal/gadget/UsbGadgetAidl.java @@ -66,10 +66,6 @@ public final class UsbGadgetAidl implements UsbGadgetHal { return GADGET_HAL_V2_0; } - @Override - public void systemReady() { - } - public void serviceDied() { logAndPrint(Log.ERROR, mPw, "Usb Gadget AIDL hal service died"); synchronized (mGadgetProxyLock) { diff --git a/services/usb/java/com/android/server/usb/hal/gadget/UsbGadgetHal.java b/services/usb/java/com/android/server/usb/hal/gadget/UsbGadgetHal.java index 267247b5b835..116eb4398b56 100644 --- a/services/usb/java/com/android/server/usb/hal/gadget/UsbGadgetHal.java +++ b/services/usb/java/com/android/server/usb/hal/gadget/UsbGadgetHal.java @@ -29,69 +29,6 @@ import java.lang.String; */ public interface UsbGadgetHal { /** - * Power role: This USB port can act as a source (provide power). - * @hide - */ - public static final int HAL_POWER_ROLE_SOURCE = 1; - - /** - * Power role: This USB port can act as a sink (receive power). - * @hide - */ - public static final int HAL_POWER_ROLE_SINK = 2; - - @IntDef(prefix = { "HAL_POWER_ROLE_" }, value = { - HAL_POWER_ROLE_SOURCE, - HAL_POWER_ROLE_SINK - }) - @Retention(RetentionPolicy.SOURCE) - @interface HalUsbPowerRole{} - - /** - * Data role: This USB port can act as a host (access data services). - * @hide - */ - public static final int HAL_DATA_ROLE_HOST = 1; - - /** - * Data role: This USB port can act as a device (offer data services). - * @hide - */ - public static final int HAL_DATA_ROLE_DEVICE = 2; - - @IntDef(prefix = { "HAL_DATA_ROLE_" }, value = { - HAL_DATA_ROLE_HOST, - HAL_DATA_ROLE_DEVICE - }) - @Retention(RetentionPolicy.SOURCE) - @interface HalUsbDataRole{} - - /** - * This USB port can act as a downstream facing port (host). - * - * @hide - */ - public static final int HAL_MODE_DFP = 1; - - /** - * This USB port can act as an upstream facing port (device). - * - * @hide - */ - public static final int HAL_MODE_UFP = 2; - @IntDef(prefix = { "HAL_MODE_" }, value = { - HAL_MODE_DFP, - HAL_MODE_UFP, - }) - @Retention(RetentionPolicy.SOURCE) - @interface HalUsbPortMode{} - - /** - * UsbPortManager would call this when the system is done booting. - */ - public void systemReady(); - - /** * This function is used to query the USB functions included in the * current USB configuration. * diff --git a/services/usb/java/com/android/server/usb/hal/gadget/UsbGadgetHidl.java b/services/usb/java/com/android/server/usb/hal/gadget/UsbGadgetHidl.java index 3e5ecc5eddf4..13a1670f7ae7 100644 --- a/services/usb/java/com/android/server/usb/hal/gadget/UsbGadgetHidl.java +++ b/services/usb/java/com/android/server/usb/hal/gadget/UsbGadgetHidl.java @@ -123,10 +123,6 @@ public final class UsbGadgetHidl implements UsbGadgetHal { } } - @Override - public void systemReady() { - } - static boolean isServicePresent(IndentingPrintWriter pw) { try { IUsbGadget.getService(true); diff --git a/services/usb/java/com/android/server/usb/hal/port/UsbPortHal.java b/services/usb/java/com/android/server/usb/hal/port/UsbPortHal.java index f98c598d4190..45de058fc1e8 100644 --- a/services/usb/java/com/android/server/usb/hal/port/UsbPortHal.java +++ b/services/usb/java/com/android/server/usb/hal/port/UsbPortHal.java @@ -70,17 +70,17 @@ public interface UsbPortHal { * * @hide */ - public static final int HAL_MODE_DFP = 1; + public static final int HAL_MODE_UFP = 1; /** * This USB port can act as an upstream facing port (device). * * @hide */ - public static final int HAL_MODE_UFP = 2; + public static final int HAL_MODE_DFP = 2; @IntDef(prefix = { "HAL_MODE_" }, value = { - HAL_MODE_DFP, HAL_MODE_UFP, + HAL_MODE_DFP, }) @Retention(RetentionPolicy.SOURCE) @interface HalUsbPortMode{} |