| commit | 53b6ceee9b107e686fe6093c654587e2f6528353 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Thu Sep 19 09:32:25 2013 -0700 |
| committer | Nick Kralevich <nnk@google.com> | Thu Sep 19 09:35:19 2013 -0700 |
| tree | 13194c27dc6bf2a1c2763e442d7b25c614c40b23 | |
| parent | 86b527129e924aff87eda8f978a54187cb5f5285 [diff] |
TestFilter: Don't NPE if no methods are specified. Avoid a NullPointerException if method == null (i.e., the -m command line option isn't used). Fixes commmit 3a7cf30e2301e7af41334c647dcc3a1190e4236d. Change-Id: Ib439a892867be78ad67e313629871fecf33c90f7
diff --git a/tools/tradefed-host/src/com/android/cts/tradefed/testtype/TestFilter.java b/tools/tradefed-host/src/com/android/cts/tradefed/testtype/TestFilter.java index edff85c..448f0675 100644 --- a/tools/tradefed-host/src/com/android/cts/tradefed/testtype/TestFilter.java +++ b/tools/tradefed-host/src/com/android/cts/tradefed/testtype/TestFilter.java
@@ -88,7 +88,9 @@ */ public void setTestInclusion(String className, String method) { mIncludedClass = className; - mIncludedMethod = Pattern.compile(method); + if (method != null) { + mIncludedMethod = Pattern.compile(method); + } } /**