commit 704fe2d62895ed591317f4830dc8df2ade640a3e
author Felipe Leme <felipeal@google.com> Fri Jul 29 08:34:39 2016 -0700
committer Felipe Leme <felipeal@google.com> Fri Jul 29 16:12:40 2016 +0000
tree e19cd2ba82e9bf6111e2514e8ebf0d2f0bd3399a
parent a6b4b2179433d7293c050db5de07f1af81584301
parent 4acdde9ef027bf91c8b5c48852f12480ed774b0d

resolve merge conflicts of 4acdde9 to nyc-mr1-dev-plus-aosp

Change-Id: I2ed3041dd979368f149b6fccc84621e56c118db8

init/keychords.cpp

diff --git a/init/keychords.cpp b/init/keychords.cpp
index 1cfdd80..3dbb2f0 100644
--- a/init/keychords.cpp
+++ b/init/keychords.cpp
@@ -78,11 +78,13 @@
     if (adb_enabled == "running") {
         Service* svc = ServiceManager::GetInstance().FindServiceByKeychord(id);
         if (svc) {
-            LOG(INFO) << "Starting service " << svc->name() << " from keychord...";
+            LOG(INFO) << "Starting service " << svc->name() << " from keychord " << id;
             svc->Start();
         } else {
-            LOG(ERROR) << "service for keychord " << id << " not found";
+            LOG(ERROR) << "Service for keychord " << id << " not found";
         }
+    } else {
+        LOG(WARNING) << "Not starting service for keychord " << id << " because ADB is disabled";
     }
 }