commit a290f2d5bc298b3a97f6267ea01bdb95eeb8f037
author Scott Su <nobody@android.com> Thu Apr 30 17:27:11 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Thu Apr 30 17:27:11 2009 -0700
tree 7fe03fe38196cbd9599939c6cc0ec033730368dd
parent 7154a8b714ce1636940259fd2cd55d97da0e7ce7
parent 7592e4f9f8b89dfafc1f57e28fb293c52c1bccdc

am 7592e4f: AI 148140: CTS: fixed failed cases in LocationManagerTest.

Merge commit '7592e4f9f8b89dfafc1f57e28fb293c52c1bccdc' into donut

* commit '7592e4f9f8b89dfafc1f57e28fb293c52c1bccdc':
  AI 148140: CTS: fixed failed cases in LocationManagerTest.

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 11f7488..aeeae96 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 {
@@ -253,9 +250,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();
             }
         }