commit 25d76a5edbfbeb07e66bfb09f39039a0e7718100
author Phil Dubach <nobody@android.com> Wed May 06 11:22:36 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Wed May 06 11:22:36 2009 -0700
tree cd6445556bdcf724eb126e4fa72429385d9804e1
parent 4b08ffdb11a0dbfb0a6c338fcdd34d5d2d7a3ed3
parent d2b5fd8abb19aa1a3aa1390a07d443fad25b2244

am d2b5fd8: AI 148374: CTS: Do not ask whether to resume a session when 

Merge commit 'd2b5fd8abb19aa1a3aa1390a07d443fad25b2244' into donut

* commit 'd2b5fd8abb19aa1a3aa1390a07d443fad25b2244':
  AI 148374: CTS: Do not ask whether to resume a session when started from command line

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 ba09f5b..543ee6a 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 ResultRepository mResultRepos;
     private PlanRepository mPlanRepos;
-
-    // key: app package name
-    // value: TestPackage
     private HashMap<String, TestPackage> mTestPackageMap;
 
     enum Ints {
@@ -265,9 +262,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();
             }
         }