commit 84aee852d8c739ee624a1a7df43d3a8e03cd7ca3
author Phil Dubach <nobody@android.com> Fri May 01 23:27:57 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Fri May 01 23:27:57 2009 -0700
tree b53dbdd4c1a989eed040df5daa37209fa70602d2
parent 82e8de934b1f1bb6e28d89e12753a7ec58d87f0e
parent 44e9f24a4ef3741c0a78dc092ecb69e7453e05d1

am 44e9f24: AI 148227: CTS: Add configurable delay after installing or r

Merge commit '44e9f24a4ef3741c0a78dc092ecb69e7453e05d1' into donut

* commit '44e9f24a4ef3741c0a78dc092ecb69e7453e05d1':
  AI 148227: CTS: Add configurable delay after installing or removing an 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 c03c7a7..dd1ac40 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 {
@@ -255,9 +252,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();
             }
         }