commit 45b0c8a5e1c3b69818c8489df02fcdc46fd199fe
author Phil Dubach Tue Apr 28 21:53:06 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Tue Apr 28 21:53:06 2009 -0700
tree 692deb7e1b81dd525f90e0bffc91bec8d9ae756f
parent 6171372549ac843e88a28f5ab66d0499b5e2dc34
parent c6e9382c14fcf62bbee93e565498df06dcb489c5

am c6e9382: AI 147876: CTS: Fix signature test timeout handling and add 

Merge commit 'c6e9382c14fcf62bbee93e565498df06dcb489c5' into donut

* commit 'c6e9382c14fcf62bbee93e565498df06dcb489c5':
  AI 147876: CTS: Fix signature test timeout handling and add timeout value to config

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 56dba35..8826f31 100644
--- a/tools/host/src/com/android/cts/HostConfig.java
+++ b/tools/host/src/com/android/cts/HostConfig.java
@@ -66,9 +66,6 @@
     private CaseRepository mCaseRepos;
     private Repository mResultRepos;
     private PlanRepository mPlanRepos;
-
-    // key: app package name
-    // value: TestPackage
     private HashMap<String, TestPackage> mTestPackageMap;
     
     enum Ints {
@@ -251,9 +248,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();
             }
         }