diff options
Diffstat (limited to 'usb/gadget/aidl/default/UsbGadget.cpp')
| -rw-r--r-- | usb/gadget/aidl/default/UsbGadget.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/usb/gadget/aidl/default/UsbGadget.cpp b/usb/gadget/aidl/default/UsbGadget.cpp index 1f1dc742b6..c4986e8e18 100644 --- a/usb/gadget/aidl/default/UsbGadget.cpp +++ b/usb/gadget/aidl/default/UsbGadget.cpp @@ -149,7 +149,9 @@ Status UsbGadget::setupFunctions(long functions, const shared_ptr<IUsbGadgetCallback> &callback, uint64_t timeout, int64_t in_transactionId) { bool ffsEnabled = false; - ALOGI("functions: %ld, timeout: %ld", functions, timeout); + if (timeout == 0) { + ALOGI("timeout not setup"); + } if ((functions & GadgetFunction::ADB) != 0) { ffsEnabled = true; @@ -193,9 +195,9 @@ Status getI2cBusHelper(string *name) { return Status::ERROR; } -ScopedAStatus UsbGadget::setCurrentUsbFunctions(long functions, +ScopedAStatus UsbGadget::setCurrentUsbFunctions(int64_t functions, const shared_ptr<IUsbGadgetCallback> &callback, - int64_t timeout, + int64_t timeoutMs, int64_t in_transactionId) { std::unique_lock<std::mutex> lk(mLockSetCurrentFunction); std::string current_usb_power_operation_mode, current_usb_type; @@ -203,7 +205,6 @@ ScopedAStatus UsbGadget::setCurrentUsbFunctions(long functions, string accessoryCurrentLimitEnablePath, accessoryCurrentLimitPath, path; - ALOGI("enter setCurrentUsbFunctions, in_transactionId=%ld , %ld", in_transactionId , timeout); mCurrentUsbFunctions = functions; mCurrentUsbFunctionsApplied = false; @@ -237,7 +238,7 @@ ScopedAStatus UsbGadget::setCurrentUsbFunctions(long functions, -1, "Error while calling setCurrentUsbFunctionsCb"); } - status = setupFunctions(functions, callback, timeout, in_transactionId); + status = setupFunctions(functions, callback, timeoutMs, in_transactionId); if (status != Status::SUCCESS) { goto error; } |