diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-23 23:39:36 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-23 23:39:36 +0000 |
commit | 388e62b2396b0a9d12637e9d9d463c70dcc48062 (patch) | |
tree | 73891553d076112bb1650f0288e89a2fa1fc435c | |
parent | be335eae95509d5a348248dffcc11b750f740a27 (diff) | |
parent | 7efd2c15f6b8076f370a27de83efbf549ea19040 (diff) | |
download | suite_harness-388e62b2396b0a9d12637e9d9d463c70dcc48062.tar.gz |
Merge "Fix Crash Parser appending signals/patterns" into pi-dev am: fac3396f9c am: 85d2ae2e7b am: 61d638de0b am: 7efd2c15f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/test/suite_harness/+/11558331
Change-Id: I5204b7b6d22b1d613491cddcd8c9c717d37e7d9b
-rw-r--r-- | common/util/src/com/android/compatibility/common/util/CrashUtils.java | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/common/util/src/com/android/compatibility/common/util/CrashUtils.java b/common/util/src/com/android/compatibility/common/util/CrashUtils.java index 657708d9..b3977944 100644 --- a/common/util/src/com/android/compatibility/common/util/CrashUtils.java +++ b/common/util/src/com/android/compatibility/common/util/CrashUtils.java @@ -17,6 +17,7 @@ package com.android.compatibility.common.util; import java.io.File; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Collections; @@ -203,10 +204,17 @@ public class CrashUtils { } public static class Config { - private boolean checkMinAddress = true; - private BigInteger minCrashAddress = MIN_CRASH_ADDR; - private List<String> signals = Arrays.asList(SIGSEGV, SIGBUS); - private List<Pattern> processPatterns = Collections.emptyList(); + private boolean checkMinAddress; + private BigInteger minCrashAddress; + private List<String> signals; + private List<Pattern> processPatterns; + + public Config() { + checkMinAddress = true; + minCrashAddress = MIN_CRASH_ADDR; + setSignals(SIGSEGV, SIGBUS); + processPatterns = new ArrayList(); + } public Config setMinAddress(BigInteger minCrashAddress) { this.minCrashAddress = minCrashAddress; @@ -219,7 +227,7 @@ public class CrashUtils { } public Config setSignals(String... signals) { - this.signals = Arrays.asList(signals); + this.signals = new ArrayList(Arrays.asList(signals)); return this; } @@ -237,7 +245,7 @@ public class CrashUtils { } public Config setProcessPatterns(Pattern... processPatterns) { - this.processPatterns = Arrays.asList(processPatterns); + this.processPatterns = new ArrayList(Arrays.asList(processPatterns)); return this; } |