commit ae49d406d25b7df4f6c3a35b7054407a16558d46
author Phil Dubach Tue Apr 28 21:53:05 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Tue Apr 28 21:53:05 2009 -0700
tree 8418c4c4b8992b0eae0aa487e7caeceb174711e2
parent ff7ca9ba145ad2de361350fe464541abc19cd2bd
parent 4f35e5e9c5fa551355e250186230ee29a4c6563f

am 4f35e5e: AI 147771: CTS: Throw exception on attempts to install a non

Merge commit '4f35e5e9c5fa551355e250186230ee29a4c6563f' into donut

* commit '4f35e5e9c5fa551355e250186230ee29a4c6563f':
  AI 147771: CTS: Throw exception on attempts to install a nonexistent APK

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 1c7a31c..7d50dd3 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();
             }
         }