openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Snap for 7906314 from 4f95599b96 to sc-d2-release 

Change-Id: Iaa99f216a409e8ece99e19935000e730c47b1fde
This commit is contained in:
Android Build Coastguard Worker 2021-11-12 00:16:03 +00:00
parent 472032df09 4f95599b96
commit dda092a884
3 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
llkd/libllkd.cpp
View File

@ -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);
}
}

2
llkd/llkd-debuggable.rc
View File

@ -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

10
llkd/tests/llkd_test.cpp
View File

@ -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");