tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

USB HAL 1.3 interface

Browse source 
Supports to enable/disable USB data signaling

Bug: 142105910
Bug: 161414036

Test: USB HAL V1.3 HIDL tests
Signed-off-by: Albert Wang <albertccwang@google.com>
Change-Id: I55ac262dbcdd89ab039193ed467b94f80664c9ba
This commit is contained in:
Albert Wang 2020-11-17 13:23:40 +08:00
parent e61f61b282
commit 64bd20e416
6 changed files with 151 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
compatibility_matrices/compatibility_matrix.current.xml
View file

@ -580,7 +580,7 @@
</hal>
<hal format="hidl" optional="true">
<name>android.hardware.usb</name>
<version>1.0-2</version>
<version>1.0-3</version>
<interface>
<name>IUsb</name>
<instance>default</instance>

16
usb/1.3/Android.bp Normal file
View file

@ -0,0 +1,16 @@
// This file is autogenerated by hidl-gen -Landroidbp.
hidl_interface {
name: "android.hardware.usb@1.3",
root: "android.hardware",
srcs: [
"IUsb.hal",
],
interfaces: [
"android.hardware.usb@1.0",
"android.hardware.usb@1.1",
"android.hardware.usb@1.2",
"android.hidl.base@1.0",
],
gen_java: true,
}

32
usb/1.3/IUsb.hal Normal file
View file

@ -0,0 +1,32 @@
/*
* Copyright (C) 2021 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.hardware.usb@1.3;
import android.hardware.usb@1.2::IUsb;
interface IUsb extends @1.2::IUsb {
/**
* This function is used to enable/disable USB controller when some
* scenarios need. This function can stop and restore USB data signaling.
*
* @param enable true Enable USB data signaling.
* false Disable USB data signaling.
* @return true enable or disable USB data successfully
* false if something wrong
*/
enableUsbDataSignal(bool enable) generates(bool result);
};

2
usb/1.3/vts/OWNERS Normal file
View file

@ -0,0 +1,2 @@
albertccwang@google.com
badhri@google.com

31
usb/1.3/vts/functional/Android.bp Normal file
View file

@ -0,0 +1,31 @@
//
// Copyright (C) 2021 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
cc_test {
name: "VtsHalUsbV1_3TargetTest",
defaults: ["VtsHalTargetTestDefaults"],
srcs: ["VtsHalUsbV1_3TargetTest.cpp"],
static_libs: [
"android.hardware.usb@1.0",
"android.hardware.usb@1.1",
"android.hardware.usb@1.2",
"android.hardware.usb@1.3",
],
test_suites: [
"general-tests",
"vts",
],
}

69
usb/1.3/vts/functional/VtsHalUsbV1_3TargetTest.cpp Normal file
View file

@ -0,0 +1,69 @@
/*
* Copyright (C) 2021 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#define LOG_TAG "VtsHalUsbV1_3TargetTest"
#include <android-base/logging.h>
#include <android/hardware/usb/1.3/IUsb.h>
#include <gtest/gtest.h>
#include <hidl/GtestPrinter.h>
#include <hidl/ServiceManagement.h>
#include <log/log.h>
#include <stdlib.h>
#include <condition_variable>
using ::android::sp;
using ::android::hardware::hidl_array;
using ::android::hardware::hidl_memory;
using ::android::hardware::hidl_string;
using ::android::hardware::hidl_vec;
using ::android::hardware::Return;
using ::android::hardware::Void;
using ::android::hardware::usb::V1_0::Status;
using ::android::hardware::usb::V1_3::IUsb;
using ::android::hidl::base::V1_0::IBase;
// The main test class for the USB hidl HAL
class UsbHidlTest : public ::testing::TestWithParam<std::string> {
public:
virtual void SetUp() override {
ALOGI(__FUNCTION__);
usb = IUsb::getService(GetParam());
ASSERT_NE(usb, nullptr);
}
virtual void TearDown() override { ALOGI("Teardown"); }
// USB hidl hal Proxy
sp<IUsb> usb;
};
/*
* Check to see if enable usb data signal succeeds.
* HAL service should call enableUsbDataSignal.
*/
TEST_P(UsbHidlTest, enableUsbDataSignal) {
Return<bool> ret = usb->enableUsbDataSignal(true);
ASSERT_TRUE(ret.isOk());
}
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(UsbHidlTest);
INSTANTIATE_TEST_SUITE_P(
PerInstance, UsbHidlTest,
testing::ValuesIn(android::hardware::getAllHalInstanceNames(IUsb::descriptor)),
android::hardware::PrintInstanceNameToString);