ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "usbd: Exit in case of charger mode." into qt-r1-dev

Browse source
This commit is contained in:
TreeHugger Robot 2019-07-16 23:04:47 +00:00 • committed by Android (Google) Code Review
commit 1674790b4c
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
usbd/usbd.cpp
View file

@ -24,8 +24,6 @@
#include <hidl/HidlTransportSupport.h> #include <hidl/HidlTransportSupport.h>
#define PERSISTENT_USB_CONFIG "persist.sys.usb.config"
using android::base::GetProperty; using android::base::GetProperty;
using android::base::SetProperty; using android::base::SetProperty;
using android::hardware::configureRpcThreadpool; using android::hardware::configureRpcThreadpool;
@ -34,14 +32,15 @@ using android::hardware::usb::gadget::V1_0::IUsbGadget;
using android::hardware::Return; using android::hardware::Return;
int main(int /*argc*/, char** /*argv*/) { int main(int /*argc*/, char** /*argv*/) {
configureRpcThreadpool(1, true /*callerWillJoin*/); if (GetProperty("ro.bootmode", "") == "charger") exit(0);
configureRpcThreadpool(1, true /*callerWillJoin*/);
android::sp<IUsbGadget> gadget = IUsbGadget::getService(); android::sp<IUsbGadget> gadget = IUsbGadget::getService();
Return<void> ret; Return<void> ret;
if (gadget != nullptr) { if (gadget != nullptr) {
LOG(INFO) << "Usb HAL found."; LOG(INFO) << "Usb HAL found.";
std::string function = GetProperty(PERSISTENT_USB_CONFIG, ""); std::string function = GetProperty("persist.sys.usb.config", "");
if (function == "adb") { if (function == "adb") {
LOG(INFO) << "peristent prop is adb"; LOG(INFO) << "peristent prop is adb";
SetProperty("ctl.start", "adbd"); SetProperty("ctl.start", "adbd");