commit e3d4641db871a03055a58c7eabbbd175280ed21b
author Phil Dubach Tue Apr 28 21:52:53 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Tue Apr 28 21:52:53 2009 -0700
tree 4f33abf8fdd73a1bd27396420bc2733b953ff44b
parent e5940ebdce7499f49f35d1fa58538790dfee4b26
parent e610a1e958b9b9b2bf6d2f3d87aff38fd9e056a8

am e610a1e: AI 147559: CTS: Use longer timeouts to allow for class initi

Merge commit 'e610a1e958b9b9b2bf6d2f3d87aff38fd9e056a8' into donut

* commit 'e610a1e958b9b9b2bf6d2f3d87aff38fd9e056a8':
  AI 147559: CTS: Use longer timeouts to allow for class initialization delays

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 89b2059..e146fb9 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;
     private HashMap<String, Integer> mIntValues;
 
@@ -257,9 +254,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();
             }
         }