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

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

Browse source 
Change-Id: I2ed3041dd979368f149b6fccc84621e56c118db8
This commit is contained in:
Felipe Leme 2016-07-29 08:34:39 -07:00
commit 704fe2d628
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
init/keychords.cpp
View file

@ -78,11 +78,13 @@ static void handle_keychord() {
if (adb_enabled == "running") { if (adb_enabled == "running") {
Service* svc = ServiceManager::GetInstance().FindServiceByKeychord(id); Service* svc = ServiceManager::GetInstance().FindServiceByKeychord(id);
if (svc) { if (svc) {
LOG(INFO) << "Starting service " << svc->name() << " from keychord..."; LOG(INFO) << "Starting service " << svc->name() << " from keychord " << id;
svc->Start(); svc->Start();
} else { } 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";
} }
} }