commit 889a5dd2016f15d4c05e5a6b40a7bbcd9f33bef5
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jun 20 22:47:26 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jun 20 22:47:26 2019 +0000
tree 95342803c6cd0294fd3d48e2bc55fa7a773e014d
parent d3de490ccfab3a2209c75ca5f37cca7fd8f7e34e
parent 23eec68b5f45abb11d0b78795e36ce04c0ec73b0

Merge "usbd: Exit in case of charger mode."

usbd/usbd.cpp

diff --git a/usbd/usbd.cpp b/usbd/usbd.cpp
index 191fb92..6e24d8e 100644
--- a/usbd/usbd.cpp
+++ b/usbd/usbd.cpp
@@ -24,8 +24,6 @@
 
 #include <hidl/HidlTransportSupport.h>
 
-#define PERSISTENT_USB_CONFIG "persist.sys.usb.config"
-
 using android::base::GetProperty;
 using android::base::SetProperty;
 using android::hardware::configureRpcThreadpool;
@@ -34,14 +32,15 @@
 using android::hardware::Return;
 
 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();
     Return<void> ret;
 
     if (gadget != nullptr) {
         LOG(INFO) << "Usb HAL found.";
-        std::string function = GetProperty(PERSISTENT_USB_CONFIG, "");
+        std::string function = GetProperty("persist.sys.usb.config", "");
         if (function == "adb") {
             LOG(INFO) << "peristent prop is adb";
             SetProperty("ctl.start", "adbd");