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

Commit 04773636 authored by Albert Wang's avatar Albert Wang Committed by Android (Google) Code Review
Browse files

Merge "USB HAL 1.3 interface"

parents 501ce8cc 64bd20e4

compatibility_matrices/compatibility_matrix.current.xml

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

usb/1.3/Android.bp

0 → 100644
+16 −0
Original line number Diff line number Diff line 
// 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,

}

usb/1.3/IUsb.hal

0 → 100644
+32 −0
Original line number Diff line number Diff line 
/*

 * 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);

};

usb/1.3/vts/OWNERS

0 → 100644
+2 −0
Original line number Diff line number Diff line 
albertccwang@google.com

badhri@google.com

usb/1.3/vts/functional/Android.bp

0 → 100644
+31 −0
Original line number Diff line number Diff line 
//

// 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",

    ],

}