diff options
author | Mark Salyzyn | 2018-03-26 10:23:00 -0500 |
---|---|---|
committer | Mark Salyzyn | 2018-04-18 16:02:05 -0500 |
commit | d035dbbecf44191af398261b722d72026678eea8 (patch) | |
tree | 791494c18ef3cde456e80aee9c1da34ff4e74f0d /llkd/tests/llkd_test.cpp | |
parent | f089e1403baa70864869aea4eb680c82f7debbb1 (diff) | |
download | platform-system-core-d035dbbecf44191af398261b722d72026678eea8.tar.gz platform-system-core-d035dbbecf44191af398261b722d72026678eea8.tar.xz platform-system-core-d035dbbecf44191af398261b722d72026678eea8.zip |
llkd: default enabled for userdebug
If LLK_ENABLE_DEFAULT is false, then check "ro.llk.enable" for "eng",
also the default value if not set, and then check if userdebug build
to establish a default of true for enable. Same for
ro.khungtask.enable.
Test: llkd_unit_test report eng status on "userdebug" or "user" builds
Bug: 33808187
Bug: 72838192
Change-Id: I2adb23c7629dccaa2856c50bccbf4e363703c82c
Diffstat (limited to 'llkd/tests/llkd_test.cpp')
-rw-r--r-- | llkd/tests/llkd_test.cpp | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/llkd/tests/llkd_test.cpp b/llkd/tests/llkd_test.cpp index e3c95eba3..2de18205c 100644 --- a/llkd/tests/llkd_test.cpp +++ b/llkd/tests/llkd_test.cpp | |||
@@ -64,10 +64,16 @@ void execute(const char* command) { | |||
64 | } | 64 | } |
65 | 65 | ||
66 | seconds llkdSleepPeriod(char state) { | 66 | seconds llkdSleepPeriod(char state) { |
67 | auto default_enable = android::base::GetBoolProperty(LLK_ENABLE_PROPERTY, LLK_ENABLE_DEFAULT); | 67 | auto default_eng = android::base::GetProperty(LLK_ENABLE_PROPERTY, "eng") == "eng"; |
68 | if (android::base::GetProperty(LLK_ENABLE_PROPERTY, "nothing") == "nothing") { | 68 | auto default_enable = LLK_ENABLE_DEFAULT; |
69 | GTEST_LOG_INFO << LLK_ENABLE_PROPERTY " defaults to " << (default_enable ? "true" : "false") | 69 | if (!LLK_ENABLE_DEFAULT && default_eng && |
70 | << "\n"; | 70 | android::base::GetBoolProperty("ro.debuggable", false)) { |
71 | default_enable = true; | ||
72 | } | ||
73 | default_enable = android::base::GetBoolProperty(LLK_ENABLE_PROPERTY, default_enable); | ||
74 | if (default_eng) { | ||
75 | GTEST_LOG_INFO << LLK_ENABLE_PROPERTY " defaults to \"eng\" thus " | ||
76 | << (default_enable ? "true" : "false") << "\n"; | ||
71 | } | 77 | } |
72 | // Hail Mary hope is unconfigured. | 78 | // Hail Mary hope is unconfigured. |
73 | if ((GetUintProperty(LLK_TIMEOUT_MS_PROPERTY, LLK_TIMEOUT_MS_DEFAULT) != | 79 | if ((GetUintProperty(LLK_TIMEOUT_MS_PROPERTY, LLK_TIMEOUT_MS_DEFAULT) != |
@@ -78,6 +84,8 @@ seconds llkdSleepPeriod(char state) { | |||
78 | execute("stop llkd"); | 84 | execute("stop llkd"); |
79 | rest(); | 85 | rest(); |
80 | std::string setprop("setprop "); | 86 | std::string setprop("setprop "); |
87 | execute((setprop + LLK_ENABLE_WRITEABLE_PROPERTY + " false").c_str()); | ||
88 | rest(); | ||
81 | execute((setprop + LLK_TIMEOUT_MS_PROPERTY + " 120000").c_str()); | 89 | execute((setprop + LLK_TIMEOUT_MS_PROPERTY + " 120000").c_str()); |
82 | rest(); | 90 | rest(); |
83 | execute((setprop + KHT_TIMEOUT_PROPERTY + " 130").c_str()); | 91 | execute((setprop + KHT_TIMEOUT_PROPERTY + " 130").c_str()); |
@@ -86,8 +94,15 @@ seconds llkdSleepPeriod(char state) { | |||
86 | rest(); | 94 | rest(); |
87 | execute((setprop + LLK_ENABLE_PROPERTY + " true").c_str()); | 95 | execute((setprop + LLK_ENABLE_PROPERTY + " true").c_str()); |
88 | rest(); | 96 | rest(); |
97 | execute((setprop + LLK_ENABLE_WRITEABLE_PROPERTY + " true").c_str()); | ||
98 | rest(); | ||
99 | } | ||
100 | default_enable = LLK_ENABLE_DEFAULT; | ||
101 | if (!LLK_ENABLE_DEFAULT && (android::base::GetProperty(LLK_ENABLE_PROPERTY, "eng") == "eng") && | ||
102 | android::base::GetBoolProperty("ro.debuggable", false)) { | ||
103 | default_enable = true; | ||
89 | } | 104 | } |
90 | default_enable = android::base::GetBoolProperty(LLK_ENABLE_PROPERTY, false); | 105 | default_enable = android::base::GetBoolProperty(LLK_ENABLE_PROPERTY, default_enable); |
91 | if (default_enable) { | 106 | if (default_enable) { |
92 | execute("start llkd"); | 107 | execute("start llkd"); |
93 | rest(); | 108 | rest(); |