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

Commit e3568f3d authored by Ricky Niu's avatar Ricky Niu Committed by Chien Kun Niu
Browse files

Migrate IUsbGadget to AIDL (Fixed Commnets) 



Fixed the comments for aosp/2361672

Bug: 218791946
Test: USB function switch success and AIDL service is running.

Signed-off-by: default avatarRicky Niu <rickyniu@google.com>
Change-Id: I1bd5b96cfe0d994091338a827efe49d07be8c578
parent 1eaaea47

usb/gadget/aidl/aidl_api/android.hardware.usb.gadget/current/android/hardware/usb/gadget/IUsbGadgetCallback.aidl

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
package android.hardware.usb.gadget;

@VintfStability

interface IUsbGadgetCallback {

  oneway void setCurrentUsbFunctionsCb(in long functions, in android.hardware.usb.gadget.Status status, long transactionId);

  oneway void getCurrentUsbFunctionsCb(in long functions, in android.hardware.usb.gadget.Status status, long transactionId);

  oneway void getUsbSpeedCb(in android.hardware.usb.gadget.UsbSpeed speed, long transactionId);

  oneway void setCurrentUsbFunctionsCb(in long functions, in android.hardware.usb.gadget.Status status, long transactionId);

}

usb/gadget/aidl/android/hardware/usb/gadget/GadgetFunction.aidl

+7 −7
Original line number Diff line number Diff line
@@ -29,29 +29,29 @@ parcelable GadgetFunction { 
    /**

     * Android open accessory protocol function.

     */

    const long ACCESSORY = 2;

    const long ACCESSORY = 1 << 1;

    /**

     * Media Transfer protocol function.

     */

    const long MTP = 4;

    const long MTP = 1 << 2;

    /**

     * Peripheral mode USB Midi function.

     */

    const long MIDI = 8;

    const long MIDI = 1 << 3;

    /**

     * Picture transfer protocol function.

     */

    const long PTP = 16;

    const long PTP = 1 << 4;

    /**

     * Tethering function.

     */

    const long RNDIS = 32;

    const long RNDIS = 1 << 5;

    /**

     * AOAv2.0 - Audio Source function.

     */

    const long AUDIO_SOURCE = 64;

    const long AUDIO_SOURCE = 1 << 6;

    /**

     * NCM - NCM function.

     */

    const long NCM = 1024;

    const long NCM = 1 << 10;

}

usb/gadget/aidl/android/hardware/usb/gadget/IUsbGadget.aidl

+1 −2
Original line number Diff line number Diff line
@@ -23,8 +23,7 @@ import android.hardware.usb.gadget.IUsbGadgetCallback; 
oneway interface IUsbGadget {

    /**

     * This function is used to set the current USB gadget configuration.

     * Usb gadget needs to teared down if an USB configuration is already

     * active.

     * Usb gadget needs to be reset if an USB configuration is already.

     *

     * @param functions The GadgetFunction bitmap. See GadgetFunction for

     *                  the value of each bit.

usb/gadget/aidl/android/hardware/usb/gadget/IUsbGadgetCallback.aidl

+14 −14
Original line number Diff line number Diff line
@@ -22,6 +22,20 @@ import android.hardware.usb.gadget.UsbSpeed; 


@VintfStability

oneway interface IUsbGadgetCallback {

    /**

     * Callback function used to propagate the status of configuration

     * switch to the caller.

     *

     * @param functions list of functions defined by GadgetFunction

     *                  included in the current USB gadget composition.

     * @param status SUCCESS when the functions are applied.

     *               FUNCTIONS_NOT_SUPPORTED when the configuration is

     *                                       not supported.

     *               ERROR otherwise.

     * @param transactionId ID to be used when invoking the callback.

     */

    void setCurrentUsbFunctionsCb(in long functions, in Status status, long transactionId);



    /**

     * Callback function used to propagate the current USB gadget

     * configuration.
@@ -46,18 +60,4 @@ oneway interface IUsbGadgetCallback { 
     * @param transactionId ID to be used when invoking the callback.

     */

    void getUsbSpeedCb(in UsbSpeed speed, long transactionId);



    /**

     * Callback function used to propagate the status of configuration

     * switch to the caller.

     *

     * @param functions list of functions defined by GadgetFunction

     *                  included in the current USB gadget composition.

     * @param status SUCCESS when the functions are applied.

     *               FUNCTIONS_NOT_SUPPORTED when the configuration is

     *                                       not supported.

     *               ERROR otherwise.

     * @param transactionId ID to be used when invoking the callback.

     */

    void setCurrentUsbFunctionsCb(in long functions, in Status status, long transactionId);

}