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

Commit 1cef9f31 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fixed the build break in cf_x86_tv-userdebug"

parents 87804b1f cf684315

usb/gadget/aidl/default/UsbGadget.cpp

+6 −5
Original line number Diff line number Diff line
@@ -146,7 +146,9 @@ ScopedAStatus UsbGadget::reset() { 
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;
@@ -190,16 +192,15 @@ 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 in_transactionId) {

                                                int64_t timeoutMs, int64_t in_transactionId) {

    std::unique_lock<std::mutex> lk(mLockSetCurrentFunction);

    std::string current_usb_power_operation_mode, current_usb_type;

    std::string usb_limit_sink_enable;



    string accessoryCurrentLimitEnablePath, accessoryCurrentLimitPath, path;



    ALOGI("enter setCurrentUsbFunctions, in_transactionId=%ld , %ld", in_transactionId, timeout);

    mCurrentUsbFunctions = functions;

    mCurrentUsbFunctionsApplied = false;
@@ -232,7 +233,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;

    }

usb/gadget/aidl/default/UsbGadget.h

+2 −2
Original line number Diff line number Diff line
@@ -89,9 +89,9 @@ struct UsbGadget : public BnUsbGadget { 
    bool mCurrentUsbFunctionsApplied;

    UsbSpeed mUsbSpeed;



    ScopedAStatus setCurrentUsbFunctions(long functions,

    ScopedAStatus setCurrentUsbFunctions(int64_t functions,

                                         const shared_ptr<IUsbGadgetCallback>& callback,

                                         int64_t timeout, int64_t in_transactionId) override;

                                         int64_t timeoutMs, int64_t in_transactionId) override;



    ScopedAStatus getCurrentUsbFunctions(const shared_ptr<IUsbGadgetCallback>& callback,

                                         int64_t in_transactionId) override;

usb/gadget/aidl/default/service_gadget.cpp

+0 −5
Original line number Diff line number Diff line
@@ -17,11 +17,6 @@ 
#include <android/binder_manager.h>

#include <android/binder_process.h>

#include "UsbGadget.h"

/*using android::OK;

using android::hardware::configureRpcThreadpool;

using android::hardware::joinRpcThreadpool;

using android::sp;

using android::status_t;*/

using ::aidl::android::hardware::usb::gadget::UsbGadget;

int main() {

    ABinderProcess_setThreadPoolMaxThreadCount(0);