commit 40e5b05199f4dcc681b3211ba1e5083a71c4ff14
author Phil Dubach Tue Apr 28 21:52:52 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Tue Apr 28 21:52:52 2009 -0700
tree bc87d9420be4d9e27a081a59c9063b80ac345d32
parent 8ca05f583882e0ce320396c239b621f02862b6c3
parent a41d41458defd0cb87fd167b88b9d1cecf4f51dc

am a41d414: AI 147545: CTS: Handle timeout issues in unexpected tests

Merge commit 'a41d41458defd0cb87fd167b88b9d1cecf4f51dc' into donut

* commit 'a41d41458defd0cb87fd167b88b9d1cecf4f51dc':
  AI 147545: CTS: Handle timeout issues in unexpected tests

tools/host/src/com/android/cts/HostConfig.java

diff --git a/tools/host/src/com/android/cts/HostConfig.java b/tools/host/src/com/android/cts/HostConfig.java
index a3cb392..9bfc5a9 100644
--- a/tools/host/src/com/android/cts/HostConfig.java
+++ b/tools/host/src/com/android/cts/HostConfig.java
@@ -71,9 +71,6 @@
     private CaseRepository mCaseRepos;
     private Repository mResultRepos;
     private PlanRepository mPlanRepos;
-
-    // key: app package name
-    // value: TestPackage
     private HashMap<String, TestPackage> mTestPackageMap;
 
     static {
@@ -238,9 +235,9 @@
      * @return The binary name of the package.
      */
     public String getPackageBinaryName(String appPackageName) {
-
         for (TestPackage pkg : mTestPackageMap.values()) {
-            if (appPackageName.equals(pkg.getAppPackageName())) {
+            if ((appPackageName.startsWith(pkg.getAppPackageName()))
+                    || (appPackageName.equals(pkg.getAppBinaryName()))) {
                 return pkg.getAppBinaryName();
             }
         }