resolve merge conflicts of 4acdde9
to nyc-mr1-dev-plus-aosp
Change-Id: I2ed3041dd979368f149b6fccc84621e56c118db8
This commit is contained in:
commit
704fe2d628
1 changed files with 4 additions and 2 deletions
|
@ -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";
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue