summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2021-02-20 15:52:07 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2021-02-20 15:52:07 +0000
commit929160184deb707ca91c2e6a95bc38f8e5a59d4f (patch)
tree0bc970eda6e86afc811e1d2273775a2aaf6c43b5
parentc9ad4f00db25fd613beb5b732fa72e750104f520 (diff)
parent3596d0527114d094e517dde3ba3b72bdd2401bb1 (diff)
Merge "Fix USB HAL interface binder" into sc-dev
-rw-r--r--services/usb/java/com/android/server/usb/UsbPortManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/usb/java/com/android/server/usb/UsbPortManager.java b/services/usb/java/com/android/server/usb/UsbPortManager.java
index 6bf67154efd5..c53c95cc982e 100644
--- a/services/usb/java/com/android/server/usb/UsbPortManager.java
+++ b/services/usb/java/com/android/server/usb/UsbPortManager.java
@@ -42,13 +42,13 @@ import android.hardware.usb.ParcelableUsbPort;
import android.hardware.usb.UsbManager;
import android.hardware.usb.UsbPort;
import android.hardware.usb.UsbPortStatus;
+import android.hardware.usb.V1_0.IUsb;
import android.hardware.usb.V1_0.PortRole;
import android.hardware.usb.V1_0.PortRoleType;
import android.hardware.usb.V1_0.Status;
import android.hardware.usb.V1_1.PortStatus_1_1;
import android.hardware.usb.V1_2.IUsbCallback;
import android.hardware.usb.V1_2.PortStatus;
-import android.hardware.usb.V1_3.IUsb;
import android.hidl.manager.V1_0.IServiceManager;
import android.hidl.manager.V1_0.IServiceNotification;
import android.os.Bundle;