diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2013-04-05 13:43:34 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-05 13:43:34 -0700 |
| commit | c307aa5f038cea2a0fb5bb535f5930758bdfbb81 (patch) | |
| tree | d52f645c2c90a2af6930b65b851445953adcf366 | |
| parent | ca02a136902ba44c64e90c87dd3be82a0ca7877f (diff) | |
| parent | b4d52a437e97489710182ebc6a8a3e00d6fbd6f0 (diff) | |
| download | system_core-c307aa5f038cea2a0fb5bb535f5930758bdfbb81.zip system_core-c307aa5f038cea2a0fb5bb535f5930758bdfbb81.tar.gz system_core-c307aa5f038cea2a0fb5bb535f5930758bdfbb81.tar.bz2 | |
am b4d52a43: Only handle keycodes when adb is enabled.
* commit 'b4d52a437e97489710182ebc6a8a3e00d6fbd6f0':
Only handle keycodes when adb is enabled.
| -rw-r--r-- | init/keychords.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/init/keychords.c b/init/keychords.c index aab0819..061d157 100644 --- a/init/keychords.c +++ b/init/keychords.c @@ -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); |