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

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

Merge "Add resetCb"

parents 8f001f08 44612031

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -37,5 +37,5 @@ interface IUsbGadget { 
  oneway void setCurrentUsbFunctions(in long functions, in android.hardware.usb.gadget.IUsbGadgetCallback callback, in long timeoutMs, long transactionId);

  oneway void setCurrentUsbFunctions(in long functions, in android.hardware.usb.gadget.IUsbGadgetCallback callback, in long timeoutMs, long transactionId);

  oneway void getCurrentUsbFunctions(in android.hardware.usb.gadget.IUsbGadgetCallback callback, long transactionId);

  oneway void getCurrentUsbFunctions(in android.hardware.usb.gadget.IUsbGadgetCallback callback, long transactionId);

  oneway void getUsbSpeed(in android.hardware.usb.gadget.IUsbGadgetCallback callback, long transactionId);

  oneway void getUsbSpeed(in android.hardware.usb.gadget.IUsbGadgetCallback callback, long transactionId);

  oneway void reset();

  oneway void reset(in android.hardware.usb.gadget.IUsbGadgetCallback callback, long transactionId);

}
 
}

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -37,4 +37,5 @@ interface IUsbGadgetCallback { 
  oneway void setCurrentUsbFunctionsCb(in long functions, in android.hardware.usb.gadget.Status status, long transactionId);

  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 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 getUsbSpeedCb(in android.hardware.usb.gadget.UsbSpeed speed, long transactionId);

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

}
 
}

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

+5 −1
Original line number Original line Diff line number Diff line
@@ -59,6 +59,10 @@ oneway interface IUsbGadget { 
     * This function is used to reset USB gadget driver.

     * This function is used to reset USB gadget driver.

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

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

     * reconnect.

     * reconnect.

     *

     * @param callback IUsbGadgetCallback::resetCb used to propagate

     *                 the result of requesting resetUsbGadget.

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

     */

     */

    void reset();

    void reset(in IUsbGadgetCallback callback, long transactionId);

}
 
}

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

+8 −0
Original line number Original line Diff line number Diff line
@@ -59,4 +59,12 @@ oneway interface IUsbGadgetCallback { 
     * @param transactionId ID to be used when invoking the callback.

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

     */

     */

    void getUsbSpeedCb(in UsbSpeed speed, long transactionId);

    void getUsbSpeedCb(in UsbSpeed speed, long transactionId);



    /**

     * Callback function used to propagate the result of requesting

     * resetUsbGadget.

     * @param status SUCCESS if current request succeeded. FAILURE otherwise.

     * @param transactionId current transactionId sent during reset request.

     */

    void resetCb(in Status status, long transactionId);

}
 
}

usb/gadget/aidl/default/UsbGadget.cpp

+4 −1
Original line number Original line Diff line number Diff line
@@ -144,7 +144,10 @@ Status UsbGadget::tearDownGadget() { 
    return Status::SUCCESS;

    return Status::SUCCESS;

}

}





ScopedAStatus UsbGadget::reset() {

ScopedAStatus UsbGadget::reset(const shared_ptr<IUsbGadgetCallback> &callback,

        int64_t in_transactionId) {

    if (callback)

        callback->resetCb(Status::SUCCESS, in_transactionId);

    return ScopedAStatus::ok();

    return ScopedAStatus::ok();

}

}