aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-05 02:16:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Tuning system health diags" into ub-launcher3-qt-r1-dev

Browse Source
This commit is contained in:
Vadim Tryshev
2019-07-25 22:30:23 +00:00
committed by Android (Google) Code Review
parent 2cccb134a4 98193241c3
commit 1b0445dfa4
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
View File

@@ -331,8 +331,10 @@ public final class LauncherInstrumentation {
final String systemHealth = getSystemHealthMessage();
if (systemHealth != null) {
message = message + ", which might be a consequence of system health problems:\n<<<\n"
+ systemHealth + "\n>>>";
message = message
+ ", which might be a consequence of system health "
+ "problems:\n<<<<<<<<<<<<<<<<<<\n"
+ systemHealth + "\n>>>>>>>>>>>>>>>>>>";
}
log("Hierarchy dump for: " + message);

6
tests/tapl/com/android/launcher3/tapl/TestHelpers.java
View File

@@ -109,6 +109,7 @@ public class TestHelpers {
DropBoxManager.Entry entry;
StringBuilder errorDetails = new StringBuilder();
while (null != (entry = dropbox.getNextEntry(label, timestamp))) {
if (errorDetails.length() != 0) errorDetails.append("------------------------------");
timestamp = entry.getTimeMillis();
errorDetails.append(new Date(timestamp));
errorDetails.append(": ");
@@ -135,7 +136,6 @@ public class TestHelpers {
"system_server_crash",
"system_server_native_crash",
"system_server_watchdog",
"system_server_wtf",
};
for (String label : labels) {
@@ -143,7 +143,9 @@ public class TestHelpers {
if (crash != null) errors.append(crash);
}
return errors.length() != 0 ? errors.toString() : null;
return errors.length() != 0
? "Current time: " + new Date(System.currentTimeMillis()) + "\n" + errors
: null;
} catch (Exception e) {
return "Failed to get system health diags, maybe build your test via .bp instead of "
+ ".mk? " + android.util.Log.getStackTraceString(e);