commit c7dcfd4df3bda23628b10222088b84e800fd06d5
author Stuart Scott <stuartscott@google.com> Mon Sep 22 16:03:45 2014 -0700
committer Unsuk Jung <unsuk@google.com> Mon Sep 22 23:39:39 2014 +0000
tree d8ce7584fc9cece80c96b7dacef3f5f10e61f00a
parent 084bd252873c70ca2d7e0d98c97ab96f598c50aa

Fixes run cts --class

Bug: 17614802

Change-Id: Id93f0efbc4a2b36b9f2d7eaf95caf1faa7e07c51

tools/tradefed-host/src/com/android/cts/tradefed/testtype/TestPackageRepo.java

diff --git a/tools/tradefed-host/src/com/android/cts/tradefed/testtype/TestPackageRepo.java b/tools/tradefed-host/src/com/android/cts/tradefed/testtype/TestPackageRepo.java
index 6d10244..7b57a44 100644
--- a/tools/tradefed-host/src/com/android/cts/tradefed/testtype/TestPackageRepo.java
+++ b/tools/tradefed-host/src/com/android/cts/tradefed/testtype/TestPackageRepo.java
@@ -161,10 +161,10 @@
     @Override
     public Set<String> findPackageIdsForTest(String testClassName) {
         Set<String> ids = new HashSet<String>();
-        for (Map<String, TestPackageDef> map : mTestMap.values()) {
-            for (Entry<String, TestPackageDef> entry : map.entrySet()) {
-                if (entry.getValue().isKnownTestClass(testClassName)) {
-                    ids.add(entry.getKey());
+        for (String abi : mTestMap.keySet()) {
+            for (String name : mTestMap.get(abi).keySet()) {
+                if (mTestMap.get(abi).get(name).isKnownTestClass(testClassName)) {
+                    ids.add(AbiUtils.createId(abi, name));
                 }
             }
         }