diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-11-12 00:09:11 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-11-12 00:09:11 +0000 |
| commit | bb8ff3be53be6af967c642c344fe21023cd4011b (patch) | |
| tree | fb5759436eb4672e7bcab4c9c3ec5e6738128723 | |
| parent | 39cf8909ce55687225994506c0972c855603404b (diff) | |
| parent | 4f95599b96bb6431e56cfb93ff4f7e31c4322edf (diff) | |
Snap for 7906314 from 4f95599b96bb6431e56cfb93ff4f7e31c4322edf to sc-v2-release
Change-Id: I76d185d9d58c4b6eca50248b29264c429a1024e3
| -rw-r--r-- | llkd/libllkd.cpp | 3 | ||||
| -rw-r--r-- | llkd/llkd-debuggable.rc | 2 | ||||
| -rw-r--r-- | llkd/tests/llkd_test.cpp | 10 |
3 files changed, 3 insertions, 12 deletions
diff --git a/llkd/libllkd.cpp b/llkd/libllkd.cpp index c4c58eef3..42602e9ee 100644 --- a/llkd/libllkd.cpp +++ b/llkd/libllkd.cpp @@ -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); } } diff --git a/llkd/llkd-debuggable.rc b/llkd/llkd-debuggable.rc index 4b11b1c7a..c07560910 100644 --- a/llkd/llkd-debuggable.rc +++ b/llkd/llkd-debuggable.rc @@ -1,5 +1,5 @@ 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 diff --git a/llkd/tests/llkd_test.cpp b/llkd/tests/llkd_test.cpp index 475512c38..8eb9b001f 100644 --- a/llkd/tests/llkd_test.cpp +++ b/llkd/tests/llkd_test.cpp @@ -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"); |