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

am b4d52a43: Only handle keycodes when adb is enabled. 

* commit 'b4d52a437e97489710182ebc6a8a3e00d6fbd6f0':
  Only handle keycodes when adb is enabled.
This commit is contained in:
Jeff Sharkey 2013-04-05 13:43:34 -07:00 committed by Android Git Automerger
parent ca02a13690 b4d52a437e
commit c307aa5f03
1 changed files with 2 additions and 6 deletions

8
init/keychords.c
View File

@ -100,10 +100,7 @@ void handle_keychord()
int ret;
__u16 id;
// only handle keychords if ro.debuggable is set or adb is enabled.
// the logic here is that bugreports should be enabled in userdebug or eng builds
// and on user builds for users that are developers.
debuggable = property_get("ro.debuggable");
// Only handle keychords if adb is enabled.
adb_enabled = property_get("init.svc.adbd");
ret = read(keychord_fd, &id, sizeof(id));
if (ret != sizeof(id)) {
@ -111,8 +108,7 @@ void handle_keychord()
return;
}
if ((debuggable && !strcmp(debuggable, "1")) ||
(adb_enabled && !strcmp(adb_enabled, "running"))) {
if ((adb_enabled && !strcmp(adb_enabled, "running"))) {
svc = service_find_by_keychord(id);
if (svc) {
INFO("starting service %s from keychord\n", svc->name);