commit ec087cb8f1dff6e3b6e8462dc590bbc65750f193
author Scott Su Tue Apr 28 21:53:01 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Tue Apr 28 21:53:01 2009 -0700
tree daf05bfcc5e3b12bafd0b96198257839d01b2f05
parent 8e209e4f3a12380a9bbdc9f949d5a28a13ba0832
parent a9e8720929c3d7978b2768319a9a6eea53233b4f

am a9e8720: AI 147655: CTS: add test cases for android.app.KeyguardManag

Merge commit 'a9e8720929c3d7978b2768319a9a6eea53233b4f' into donut

* commit 'a9e8720929c3d7978b2768319a9a6eea53233b4f':
  AI 147655: CTS: add test cases for android.app.KeyguardManager

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 89b2059..e146fb9 100644
--- a/tools/host/src/com/android/cts/HostConfig.java
+++ b/tools/host/src/com/android/cts/HostConfig.java
@@ -71,9 +71,6 @@
     private CaseRepository mCaseRepos;
     private Repository mResultRepos;
     private PlanRepository mPlanRepos;
-
-    // key: app package name
-    // value: TestPackage
     private HashMap<String, TestPackage> mTestPackageMap;
     private HashMap<String, Integer> mIntValues;
 
@@ -257,9 +254,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();
             }
         }