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

Commit 9ae79098 authored by Howard Yen's avatar Howard Yen Committed by Android (Google) Code Review
Browse files

Merge changes from topic "usb_gadget_reset" 

* changes:
  Add USB Gadget Hal v1.1 default implementation
  Add USB Gadget V1.1 with hash code
  USB Gadget V1.1 interface
parents 5d372032 9bfb4352

compatibility_matrices/compatibility_matrix.current.xml

+1 −1
Original line number Diff line number Diff line
@@ -475,7 +475,7 @@ 
    </hal>

    <hal format="hidl" optional="true">

        <name>android.hardware.usb.gadget</name>

        <version>1.0</version>

        <version>1.0-1</version>

        <interface>

            <name>IUsbGadget</name>

            <instance>default</instance>

current.txt

+1 −0
Original line number Diff line number Diff line
@@ -680,3 +680,4 @@ a2977755bc5f1ef47f04b7f2400632efda6218e1515dba847da487145cfabc4f android.hardwar 
##

51d1c8d285e0456da2a3fdfbf4700c6277165d5e83219894d651c8ea0e39aa8b android.hardware.soundtrigger@2.3::types

12d7533ff0754f45bf59ab300799074570a99a676545652c2c23abc73cb4515d android.hardware.soundtrigger@2.3::ISoundTriggerHw

7746fda1fbf9c7c132bae701cc5a161309e4f5e7f3e8065811045975ee86196d android.hardware.usb.gadget@1.1::IUsbGadget

usb/gadget/1.1/Android.bp

0 → 100644
+17 −0
Original line number Diff line number Diff line 
// This file is autogenerated by hidl-gen -Landroidbp.



hidl_interface {

    name: "android.hardware.usb.gadget@1.1",

    root: "android.hardware",

    vndk: {

        enabled: true,

    },

    srcs: [

        "IUsbGadget.hal",

    ],

    interfaces: [

        "android.hardware.usb.gadget@1.0",

        "android.hidl.base@1.0",

    ],

    gen_java: true,

}

usb/gadget/1.1/IUsbGadget.hal

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

 * Copyright (C) 2019 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.gadget@1.1;



import @1.0::IUsbGadget;

import @1.0::Status;



interface IUsbGadget extends @1.0::IUsbGadget {

    /**

     * This function is used to reset USB gadget driver.

     * Performs USB data connection reset. The connection will disconnect and

     * reconnect.

     *

     * return status indicate success or not.

     */

    reset() generates(Status status);

};

usb/gadget/1.1/default/Android.bp

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

 * Copyright (C) 2020 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_binary {

    name: "android.hardware.usb.gadget@1.1-service",

    defaults: ["hidl_defaults"],

    relative_install_path: "hw",

    init_rc: ["android.hardware.usb.gadget@1.1-service.rc"],

    vintf_fragments: ["android.hardware.usb.gadget@1.1-service.xml"],

    vendor: true,

    srcs: [

        "service.cpp",

        "UsbGadget.cpp",

    ],

    shared_libs: [

        "android.hardware.usb.gadget@1.0",

        "android.hardware.usb.gadget@1.1",

        "libbase",

        "libcutils",

        "libhardware",

        "libhidlbase",

        "liblog",

        "libutils",

    ],

    static_libs: ["libusbconfigfs"],

}