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

Commit 9bb4eb02 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "USB-GADGET-HAL-v1.2" 

* changes:
  Add USB Gadget Hal v1.2 default implementation
  USB Gadget hal v1.2 interface
parents f4c82a84 e96a2a84

compatibility_matrices/compatibility_matrix.current.xml

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

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

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

        <version>1.0-1</version>

        <version>1.0-2</version>

        <interface>

            <name>IUsbGadget</name>

            <instance>default</instance>

usb/gadget/1.2/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.2",

    root: "android.hardware",

    srcs: [

        "types.hal",

        "IUsbGadget.hal",

        "IUsbGadgetCallback.hal",

    ],

    interfaces: [

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

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

        "android.hidl.base@1.0",

    ],

    gen_java: true,

}

usb/gadget/1.2/IUsbGadget.hal

0 → 100644
+30 −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.

 */



package android.hardware.usb.gadget@1.2;



import IUsbGadgetCallback;

import android.hardware.usb.gadget@1.1::IUsbGadget;



interface IUsbGadget extends @1.1::IUsbGadget {

    /**

     * The function is used to query current USB speed.

     *

     * @param callback IUsbGadgetCallback::getUsbSpeedCb used to propagate

     *                 current USB speed.

     */

    oneway getUsbSpeed(IUsbGadgetCallback callback);

};

usb/gadget/1.2/IUsbGadgetCallback.hal

0 → 100644
+33 −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.

 */



package android.hardware.usb.gadget@1.2;



import UsbSpeed;

import android.hardware.usb.gadget@1.0::IUsbGadgetCallback;



interface IUsbGadgetCallback extends @1.0::IUsbGadgetCallback {

    /**

     * Used to convey the current USB speed to the caller.

     * Must be called either when USB state changes due to USB enumeration or

     * when caller requested for USB speed through getUsbSpeed.

     *

     * @param speed USB Speed defined by UsbSpeed showed current USB

     *              connection speed.

     */

    oneway getUsbSpeedCb(UsbSpeed speed);

};

usb/gadget/1.2/default/Android.bp

0 → 100644
+40 −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.2-service",

    defaults: ["hidl_defaults"],

    relative_install_path: "hw",

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

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

    vendor: true,

    srcs: [

        "service.cpp",

        "UsbGadget.cpp",

    ],

    shared_libs: [

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

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

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

        "libbase",

        "libcutils",

        "libhardware",

        "libhidlbase",

        "liblog",

        "libutils",

    ],

    static_libs: ["libusbconfigfs-2"],

}