am 5380b3b9: am 2a5ab1eb: am dc566f11: am 3583c34b: am 6c263954: am 1d190b4a: am 2c17c3c1: am e758fe69: am 1217b9dc: Fix NPE when package uris in plan is unknown.
* commit '5380b3b911f84a8b7bb5812fef7f9a14efea0ca4':
Fix NPE when package uris in plan is unknown.
diff --git a/tools/tradefed-host/src/com/android/cts/tradefed/testtype/CtsTest.java b/tools/tradefed-host/src/com/android/cts/tradefed/testtype/CtsTest.java
index c6977e5..48f4773 100644
--- a/tools/tradefed-host/src/com/android/cts/tradefed/testtype/CtsTest.java
+++ b/tools/tradefed-host/src/com/android/cts/tradefed/testtype/CtsTest.java
@@ -43,14 +43,13 @@
import com.android.tradefed.util.RunUtil;
import com.android.tradefed.util.xml.AbstractXmlParser.ParseException;
+import junit.framework.Test;
+
import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.InputStream;
-import java.lang.InterruptedException;
-import java.lang.System;
-import java.lang.Thread;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -63,8 +62,6 @@
import java.util.Queue;
import java.util.Set;
-import junit.framework.Test;
-
/**
* A {@link Test} for running CTS tests.
* <p/>
@@ -600,8 +597,13 @@
for (String uri : plan.getTestUris()) {
if (!mExcludedPackageNames.contains(uri)) {
ITestPackageDef testPackage = testRepo.getTestPackage(uri);
- testPackage.setExcludedTestFilter(plan.getExcludedTestFilter(uri));
- testPkgDefs.add(testPackage);
+ if (testPackage != null) {
+ testPackage.setExcludedTestFilter(plan.getExcludedTestFilter(uri));
+ testPkgDefs.add(testPackage);
+ } else {
+ CLog.e("Could not find test package uri %s referenced in plan %s", uri,
+ mPlanName);
+ }
}
}
} else if (mPackageNames.size() > 0){