Skip to content

Commit 2b92541

Browse files
llkd: Disable in userdebug builds by default
While llkd helps in discovering issues in apps which leave zombies, it creates issues for dogfooders when apps are killed. Disable it by default. Bug: 202411543 Test: boot and check llkd not running Test: `setprop ro.llk.enable true` enables llkd Signed-off-by: Suren Baghdasaryan <[email protected]> Change-Id: If93bf9e981eaa3921a9da5f3160db26c4fe17e66
1 parent a86af7c commit 2b92541

File tree

3 files changed

+3
-12
lines changed

3 files changed

+3
-12
lines changed

llkd/libllkd.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1283,8 +1283,7 @@ bool llkInit(const char* threadname) {
12831283
llkEnableSysrqT &= !llkLowRam;
12841284
if (debuggable) {
12851285
llkEnableSysrqT |= llkCheckEng(LLK_ENABLE_SYSRQ_T_PROPERTY);
1286-
if (!LLK_ENABLE_DEFAULT) { // NB: default is currently true ...
1287-
llkEnable |= llkCheckEng(LLK_ENABLE_PROPERTY);
1286+
if (!LLK_ENABLE_DEFAULT) {
12881287
khtEnable |= llkCheckEng(KHT_ENABLE_PROPERTY);
12891288
}
12901289
}

llkd/llkd-debuggable.rc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
on property:ro.debuggable=1
2-
setprop llk.enable ${ro.llk.enable:-1}
2+
setprop llk.enable ${ro.llk.enable:-0}
33
setprop khungtask.enable ${ro.khungtask.enable:-1}
44

55
on property:ro.llk.enable=eng

llkd/tests/llkd_test.cpp

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,9 @@ void execute(const char* command) {
6969
seconds llkdSleepPeriod(char state) {
7070
auto default_eng = android::base::GetProperty(LLK_ENABLE_PROPERTY, "eng") == "eng";
7171
auto default_enable = LLK_ENABLE_DEFAULT;
72-
if (!LLK_ENABLE_DEFAULT && default_eng &&
73-
android::base::GetBoolProperty("ro.debuggable", false)) {
74-
default_enable = true;
75-
}
7672
default_enable = android::base::GetBoolProperty(LLK_ENABLE_PROPERTY, default_enable);
7773
if (default_eng) {
78-
GTEST_LOG_INFO << LLK_ENABLE_PROPERTY " defaults to \"eng\" thus "
74+
GTEST_LOG_INFO << LLK_ENABLE_PROPERTY " defaults to "
7975
<< (default_enable ? "true" : "false") << "\n";
8076
}
8177
// Hail Mary hope is unconfigured.
@@ -108,10 +104,6 @@ seconds llkdSleepPeriod(char state) {
108104
rest();
109105
}
110106
default_enable = LLK_ENABLE_DEFAULT;
111-
if (!LLK_ENABLE_DEFAULT && (android::base::GetProperty(LLK_ENABLE_PROPERTY, "eng") == "eng") &&
112-
android::base::GetBoolProperty("ro.debuggable", false)) {
113-
default_enable = true;
114-
}
115107
default_enable = android::base::GetBoolProperty(LLK_ENABLE_PROPERTY, default_enable);
116108
if (default_enable) {
117109
execute("start llkd-1");

0 commit comments

Comments
 (0)