commit ad1d56eb6190b9429953f739b4c1d5eb14080878
author Takayuki Hoshi <hoshi@google.com> Wed Nov 12 08:55:34 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 12 08:55:34 2014 +0000
tree 3c975c640eb80e5e351dc1896dafe78cdb5227a2
parent 92df3435c8e01f095f57b92ce6ba94b91b02d1a3
parent b087665b3a86cf44d1f6bb7b34c9ba6c0e6bcb4b

am b087665b: Clean up ManifestTestListAdapter\'s filterTests loop.

* commit 'b087665b3a86cf44d1f6bb7b34c9ba6c0e6bcb4b':
  Clean up ManifestTestListAdapter's filterTests loop.

apps/CtsVerifier/src/com/android/cts/verifier/ManifestTestListAdapter.java

diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/ManifestTestListAdapter.java b/apps/CtsVerifier/src/com/android/cts/verifier/ManifestTestListAdapter.java
index 0b73642..ebddf4f 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/ManifestTestListAdapter.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/ManifestTestListAdapter.java
@@ -305,11 +305,8 @@
     List<TestListItem> filterTests(List<TestListItem> tests) {
         List<TestListItem> filteredTests = new ArrayList<TestListItem>();
         for (TestListItem test : tests) {
-            String[] excludedFeatures = test.excludedFeatures;
-            String[] requiredFeatures = test.requiredFeatures;
-            String[] applicableFeatures = test.applicableFeatures;
-            if (!hasAnyFeature(excludedFeatures) && hasAllFeatures(requiredFeatures)) {
-                if (hasAnyFeature(applicableFeatures) || hasAllFeatures(applicableFeatures)) {
+            if (!hasAnyFeature(test.excludedFeatures) && hasAllFeatures(test.requiredFeatures)) {
+                if (test.applicableFeatures == null || hasAnyFeature(test.applicableFeatures)) {
                     filteredTests.add(test);
                 }
             }