commit 11aa01deaa0f16d3814707e7bfa2a26e43265f34
author Phil Dubach <nobody@android.com> Tue May 05 17:42:45 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Tue May 05 17:42:45 2009 -0700
tree 92049fff2df00ca189356df8d53d23634ece680a
parent 91648cf8d7a0f1f3dbb5b74658bd9faffb7c426a
parent f5668c7bee6a3c68ffdcc51bbc9313af547ab770

am f5668c7: AI 148327: CTS: Mark flaky test MediaControllerTest.testDisp

Merge commit 'f5668c7bee6a3c68ffdcc51bbc9313af547ab770' into donut

* commit 'f5668c7bee6a3c68ffdcc51bbc9313af547ab770':
  AI 148327: CTS: Mark flaky test MediaControllerTest.testDispatchKeyEvent as broken

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();
             }
         }