Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed the build break in cf_x86_tv-userdebug

Browse Source 
Change the long to int64_t in function setCurrentUsbFunctions

Note:: This is a cherry-pick of ag/20605909
Test: Build Pass
Bug: 260947383
Merged-In: I4832e2890ea561c8ad377e5a62bfa22dae35bf0f
Change-Id: I4832e2890ea561c8ad377e5a62bfa22dae35bf0f
Signed-off-by: Ricky Niu <rickyniu@google.com>
This commit is contained in:
Ricky Niu
2023-01-12 14:48:53 +08:00
parent ef0ed10e8f
commit cf6843151a
3 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
usb/gadget/aidl/default/UsbGadget.cpp
View File

@@ -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;
}

4
usb/gadget/aidl/default/UsbGadget.h
View File

@@ -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;

5
usb/gadget/aidl/default/service_gadget.cpp
View File

@@ -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);