Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b4d52a43 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Only handle keycodes when adb is enabled. 

This prevents accidental bugreports on userdebug/eng devices.

Bug: 8541006
Change-Id: Iefd15826090fd91434403f197cfd166e64400224
parent c1e47294

init/keychords.c

+2 −6
Original line number Diff line number Diff line
@@ -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);