commit 8623e2d177caa4c6e91c826b2b4155331fc33dbe
author Phil Dubach <nobody@android.com> Thu Apr 30 17:36:29 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Thu Apr 30 17:36:29 2009 -0700
tree ba523180b72471e371e5b64ed9b0afb0b0f416fb
parent f1f19985c6f037e1a9f7a964d785303b2dd07b0e
parent 9c8fbb1ce18f51c64309173610e42f7fea675853

am 9c8fbb1: AI 148148: CTS: Encode SHA-1 hash of test packages in hex in

Merge commit '9c8fbb1ce18f51c64309173610e42f7fea675853' into donut

* commit '9c8fbb1ce18f51c64309173610e42f7fea675853':
  AI 148148: CTS: Encode SHA-1 hash of test packages in hex instead of Base64

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