summaryrefslogtreecommitdiffstats
path: root/usb
diff options
context:
space:
mode:
authorHsin-Yi Chen <hsinyichen@google.com>2018-07-09 19:47:57 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-07-09 19:47:57 -0700
commitbf03ebe580ff8c32618bed4d72ecbe7faadfa2e6 (patch)
tree4b82cadd15e4c0b7acf89c8a5e59df144dca558d /usb
parent807848693d44928c247c11c4fdfbadf6631137ec (diff)
parenta85e213544aa7fa1a471fdc5ea315fe286dbe4e2 (diff)
downloadandroid_hardware_interfaces-bf03ebe580ff8c32618bed4d72ecbe7faadfa2e6.tar.gz
android_hardware_interfaces-bf03ebe580ff8c32618bed4d72ecbe7faadfa2e6.tar.bz2
android_hardware_interfaces-bf03ebe580ff8c32618bed4d72ecbe7faadfa2e6.zip
Merge "Fix IUsb version number in vts test"
am: a85e213544 Change-Id: If12009a78905e1e0639767a8b01acdabda17e715
Diffstat (limited to 'usb')
-rw-r--r--usb/1.1/vts/functional/VtsHalUsbV1_1TargetTest.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/usb/1.1/vts/functional/VtsHalUsbV1_1TargetTest.cpp b/usb/1.1/vts/functional/VtsHalUsbV1_1TargetTest.cpp
index c990b237f..caf9c695b 100644
--- a/usb/1.1/vts/functional/VtsHalUsbV1_1TargetTest.cpp
+++ b/usb/1.1/vts/functional/VtsHalUsbV1_1TargetTest.cpp
@@ -31,8 +31,8 @@
#include <condition_variable>
#include <mutex>
+using ::android::hardware::usb::V1_1::IUsb;
using ::android::hardware::usb::V1_1::IUsbCallback;
-using ::android::hardware::usb::V1_0::IUsb;
using ::android::hardware::usb::V1_0::PortDataRole;
using ::android::hardware::usb::V1_0::PortMode;
using ::android::hardware::usb::V1_1::PortMode_1_1;