openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

am: 704fe2d628

Change-Id: Ib71a0d4192273e6dac1359895619a73632b817d2
This commit is contained in:
Felipe Leme 2016-07-29 16:22:50 +00:00 committed by android-build-merger
parent d0cf9c2165 704fe2d628
commit 0c4007eed2
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") {
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";
}
}