commit 8e208f98b4604d0131e03084a3170865ffe526e1
author Phil Dubach <nobody@android.com> Thu Apr 30 17:56:05 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Thu Apr 30 17:56:05 2009 -0700
tree 8b15730f225bc8bffac54bf1140cc3a7df3e6d5a
parent 8623e2d177caa4c6e91c826b2b4155331fc33dbe
parent e0e579051414248e1b74fbfe5029d07b7edcd456

am e0e5790: AI 148153: CTS: Strip control characters from failure string

Merge commit 'e0e579051414248e1b74fbfe5029d07b7edcd456' into donut

* commit 'e0e579051414248e1b74fbfe5029d07b7edcd456':
  AI 148153: CTS: Strip control characters from failure strings before converting to XML

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