commit 25f0746f7b6b9d4ee9a870c5bb6e89124529ad8d
author Bill Napier <nobody@android.com> Thu Apr 30 17:09:25 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Thu Apr 30 17:09:25 2009 -0700
tree 433dcdb2fbd8246efbaa6c055a3b08f4ecfa8162
parent f6469daee7345fe59bf0ea7b30c556642a14f01d
parent 6d152af15daf3c35f65d5fe66b5bc6dfc0066b24

am 6d152af: AI 148066: Change perf2 app test from Calculator to MusicBro

Merge commit '6d152af15daf3c35f65d5fe66b5bc6dfc0066b24' into donut

* commit '6d152af15daf3c35f65d5fe66b5bc6dfc0066b24':
  AI 148066: Change perf2 app test from Calculator to MusicBrowser.

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 842190f..4db1fe9 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();
             }
         }