pa-fazil
/
android_system_core
mirror of https://github.com/fazilsheik96/android_system_core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

usb: migration to USB gadget AIDL 

Using the USB gadget AIDL

Bug: 261027750
Test: USB function switch success and AIDL service is running.
Change-Id: I4781ac9eb641a5340ecfb6bda0881761b7a01eb2
This commit is contained in:
Ricky Niu 2022-12-12 19:52:26 +08:00
parent 515c924312
commit ba43d547b6
2 changed files with 59 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
usbd/Android.bp
View File

@ -8,10 +8,12 @@ cc_binary {
srcs: ["usbd.cpp"], srcs: ["usbd.cpp"],
shared_libs: [ shared_libs: [
"libbase", "libbase",
"libbinder_ndk",
"libhidlbase", "libhidlbase",
"liblog", "liblog",
"libutils", "libutils",
"libhardware", "libhardware",
"android.hardware.usb.gadget@1.0", "android.hardware.usb.gadget@1.0",
"android.hardware.usb.gadget-V1-ndk",
], ],
} }

79
usbd/usbd.cpp
View File

@ -18,43 +18,78 @@
#include <string> #include <string>
#include <aidl/android/hardware/usb/gadget/GadgetFunction.h>
#include <aidl/android/hardware/usb/gadget/IUsbGadget.h>
#include <android-base/logging.h> #include <android-base/logging.h>
#include <android-base/properties.h> #include <android-base/properties.h>
#include <android/binder_manager.h>
#include <android/binder_process.h>
#include <android/hardware/usb/gadget/1.0/IUsbGadget.h> #include <android/hardware/usb/gadget/1.0/IUsbGadget.h>
#include <hidl/HidlTransportSupport.h> using aidl::android::hardware::usb::gadget::GadgetFunction;
using android::base::GetProperty; using android::base::GetProperty;
using android::base::SetProperty; using android::base::SetProperty;
using android::hardware::configureRpcThreadpool;
using android::hardware::usb::gadget::V1_0::GadgetFunction;
using android::hardware::usb::gadget::V1_0::IUsbGadget;
using android::hardware::Return; using android::hardware::Return;
using ndk::ScopedAStatus;
using std::shared_ptr;
std::atomic<int> sUsbOperationCount{};
int main(int /*argc*/, char** /*argv*/) { int main(int /*argc*/, char** /*argv*/) {
if (GetProperty("ro.bootmode", "") == "charger") exit(0); if (GetProperty("ro.bootmode", "") == "charger") exit(0);
int operationId = sUsbOperationCount++;
configureRpcThreadpool(1, true /*callerWillJoin*/); ABinderProcess_setThreadPoolMaxThreadCount(1);
android::sp<IUsbGadget> gadget = IUsbGadget::getService(); ABinderProcess_startThreadPool();
Return<void> ret; const std::string service_name =
std::string(aidl::android::hardware::usb::gadget::IUsbGadget::descriptor)
.append("/default");
if (gadget != nullptr) { std::string function = GetProperty("persist.sys.usb.config", "");
LOG(INFO) << "Usb HAL found."; if (function == "adb") {
std::string function = GetProperty("persist.sys.usb.config", ""); LOG(INFO) << "persistent prop is adb";
if (function == "adb") { SetProperty("ctl.start", "adbd");
LOG(INFO) << "peristent prop is adb"; }
SetProperty("ctl.start", "adbd");
ret = gadget->setCurrentUsbFunctions(static_cast<uint64_t>(GadgetFunction::ADB), if (AServiceManager_isDeclared(service_name.c_str())) {
nullptr, 0); shared_ptr<aidl::android::hardware::usb::gadget::IUsbGadget> gadget_aidl =
aidl::android::hardware::usb::gadget::IUsbGadget::fromBinder(
ndk::SpAIBinder(AServiceManager_waitForService(service_name.c_str())));
ScopedAStatus ret;
if (gadget_aidl != nullptr) {
LOG(INFO) << "Usb AIDL HAL found.";
if (function == "adb") {
ret = gadget_aidl->setCurrentUsbFunctions(
static_cast<uint64_t>(GadgetFunction::ADB), nullptr, 0, operationId);
} else {
LOG(INFO) << "Signal MTP to enable default functions";
ret = gadget_aidl->setCurrentUsbFunctions(
static_cast<uint64_t>(GadgetFunction::MTP), nullptr, 0, operationId);
}
if (!ret.isOk()) LOG(ERROR) << "Error while invoking usb hal";
} else { } else {
LOG(INFO) << "Signal MTP to enable default functions"; LOG(INFO) << "Usb AIDL HAL not found";
ret = gadget->setCurrentUsbFunctions(static_cast<uint64_t>(GadgetFunction::MTP),
nullptr, 0);
} }
if (!ret.isOk()) LOG(ERROR) << "Error while invoking usb hal";
} else { } else {
LOG(INFO) << "Usb HAL not found"; android::sp<android::hardware::usb::gadget::V1_0::IUsbGadget> gadget =
android::hardware::usb::gadget::V1_0::IUsbGadget::getService();
Return<void> ret;
if (gadget != nullptr) {
LOG(INFO) << "Usb HAL found.";
if (function == "adb") {
ret = gadget->setCurrentUsbFunctions(static_cast<uint64_t>(GadgetFunction::ADB),
nullptr, 0);
} else {
LOG(INFO) << "Signal MTP to enable default functions";
ret = gadget->setCurrentUsbFunctions(static_cast<uint64_t>(GadgetFunction::MTP),
nullptr, 0);
}
if (!ret.isOk()) LOG(ERROR) << "Error while invoking usb hal";
} else {
LOG(INFO) << "Usb HAL not found";
}
} }
exit(0); exit(0);
} }