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

Commit 7fe44d3b authored by Suren Baghdasaryan's avatar Suren Baghdasaryan Committed by Automerger Merge Worker
Browse files

Merge "llkd: Disable in userdebug builds by default" am: 5c210880 am:... 

Merge "llkd: Disable in userdebug builds by default" am: 5c210880 am: faad760f am: ac3810e0 am: 9f00034d

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1880604

Change-Id: Iba75eea6fe5ba4092d95c36b4625fce04ae18918
parents f26a1b7d 9f00034d

llkd/libllkd.cpp

+1 −2
Original line number Diff line number Diff line
@@ -1283,8 +1283,7 @@ bool llkInit(const char* threadname) { 
    llkEnableSysrqT &= !llkLowRam;

    if (debuggable) {

        llkEnableSysrqT |= llkCheckEng(LLK_ENABLE_SYSRQ_T_PROPERTY);

        if (!LLK_ENABLE_DEFAULT) {  // NB: default is currently true ...

            llkEnable |= llkCheckEng(LLK_ENABLE_PROPERTY);

        if (!LLK_ENABLE_DEFAULT) {

            khtEnable |= llkCheckEng(KHT_ENABLE_PROPERTY);

        }

    }

llkd/llkd-debuggable.rc

+1 −1
Original line number Diff line number Diff line 
on property:ro.debuggable=1

    setprop llk.enable ${ro.llk.enable:-1}

    setprop llk.enable ${ro.llk.enable:-0}

    setprop khungtask.enable ${ro.khungtask.enable:-1}



on property:ro.llk.enable=eng

llkd/tests/llkd_test.cpp

+1 −9
Original line number Diff line number Diff line
@@ -69,13 +69,9 @@ void execute(const char* command) { 
seconds llkdSleepPeriod(char state) {

    auto default_eng = android::base::GetProperty(LLK_ENABLE_PROPERTY, "eng") == "eng";

    auto default_enable = LLK_ENABLE_DEFAULT;

    if (!LLK_ENABLE_DEFAULT && default_eng &&

        android::base::GetBoolProperty("ro.debuggable", false)) {

        default_enable = true;

    }

    default_enable = android::base::GetBoolProperty(LLK_ENABLE_PROPERTY, default_enable);

    if (default_eng) {

        GTEST_LOG_INFO << LLK_ENABLE_PROPERTY " defaults to \"eng\" thus "

        GTEST_LOG_INFO << LLK_ENABLE_PROPERTY " defaults to "

                       << (default_enable ? "true" : "false") << "\n";

    }

    // Hail Mary hope is unconfigured.
@@ -108,10 +104,6 @@ seconds llkdSleepPeriod(char state) { 
        rest();

    }

    default_enable = LLK_ENABLE_DEFAULT;

    if (!LLK_ENABLE_DEFAULT && (android::base::GetProperty(LLK_ENABLE_PROPERTY, "eng") == "eng") &&

        android::base::GetBoolProperty("ro.debuggable", false)) {

        default_enable = true;

    }

    default_enable = android::base::GetBoolProperty(LLK_ENABLE_PROPERTY, default_enable);

    if (default_enable) {

        execute("start llkd-1");