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

Only handle keycodes when adb is enabled.

Browse source 
This prevents accidental bugreports on userdebug/eng devices.

Bug: 8541006
Change-Id: Iefd15826090fd91434403f197cfd166e64400224
This commit is contained in:
Jeff Sharkey 2013-04-04 10:44:41 -07:00
parent c1e47294c9
commit b4d52a437e
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
init/keychords.c
View file

@ -100,10 +100,7 @@ void handle_keychord()
int ret; int ret;
__u16 id; __u16 id;
// only handle keychords if ro.debuggable is set or adb is enabled. // Only handle keychords if 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");
adb_enabled = property_get("init.svc.adbd"); adb_enabled = property_get("init.svc.adbd");
ret = read(keychord_fd, &id, sizeof(id)); ret = read(keychord_fd, &id, sizeof(id));
if (ret != sizeof(id)) { if (ret != sizeof(id)) {
@ -111,8 +108,7 @@ void handle_keychord()
return; return;
} }
if ((debuggable && !strcmp(debuggable, "1")) || if ((adb_enabled && !strcmp(adb_enabled, "running"))) {
(adb_enabled && !strcmp(adb_enabled, "running"))) {
svc = service_find_by_keychord(id); svc = service_find_by_keychord(id);
if (svc) { if (svc) {
INFO("starting service %s from keychord\n", svc->name); INFO("starting service %s from keychord\n", svc->name);