commit 61d638de0b76c492116af3b0afd5cc911d1f48bd
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jul 23 23:08:21 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jul 23 23:08:21 2020 +0000
tree a84587822b44b25a896f401e0b6ba4473c4cdce5
parent 22c4a8c357dde760a206f6e6cc1bbeb2742be57d
parent 85d2ae2e7b25e8d78fea2d173ddc34313ae120db

Merge "Fix Crash Parser appending signals/patterns" into pi-dev am: fac3396f9c am: 85d2ae2e7b

Original change: https://googleplex-android-review.googlesource.com/c/platform/test/suite_harness/+/11558331

Change-Id: Ibf997acc5c10090eee6c88997af010d2b333d3ee

common/util/src/com/android/compatibility/common/util/CrashUtils.java

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 c6433a8..54cd82a 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 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 Config setSignals(String... signals) {
-            this.signals = Arrays.asList(signals);
+            this.signals = new ArrayList(Arrays.asList(signals));
             return this;
         }
 
@@ -237,7 +245,7 @@
         }
 
         public Config setProcessPatterns(Pattern... processPatterns) {
-            this.processPatterns = Arrays.asList(processPatterns);
+            this.processPatterns = new ArrayList(Arrays.asList(processPatterns));
             return this;
         }