From 77119bc6c90a62beb2f83d9496d99199a7aefe14 Mon Sep 17 00:00:00 2001
From: Dianne Hackborn <hackbod@google.com>
Date: Tue, 23 Oct 2012 14:32:48 -0700
Subject: [PATCH] Fix issue #7342364: JellyBean broke Toddler Lock, again

Change-Id: I400c02711edc302a1bc7fbf98b62fcb9f76e5e12
---
 services/java/com/android/server/pm/PackageManagerService.java | 3 ++-
 services/java/com/android/server/wm/WindowManagerService.java  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/services/java/com/android/server/pm/PackageManagerService.java b/services/java/com/android/server/pm/PackageManagerService.java
index 4c6f58975407f..8e8ae2cabf88b 100644
--- a/services/java/com/android/server/pm/PackageManagerService.java
+++ b/services/java/com/android/server/pm/PackageManagerService.java
@@ -2522,7 +2522,8 @@ public class PackageManagerService extends IPackageManager.Stub {
                     if (pa.mPref.mMatch != match) {
                         continue;
                     }
-                    final ActivityInfo ai = getActivityInfo(pa.mPref.mComponent, flags, userId);
+                    final ActivityInfo ai = getActivityInfo(pa.mPref.mComponent,
+                            flags | PackageManager.GET_DISABLED_COMPONENTS, userId);
                     if (DEBUG_PREFERRED) {
                         Log.v(TAG, "Got preferred activity:");
                         if (ai != null) {
diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java
index 1492b18e53fe7..9511a1a951f86 100755
--- a/services/java/com/android/server/wm/WindowManagerService.java
+++ b/services/java/com/android/server/wm/WindowManagerService.java
@@ -10561,7 +10561,8 @@ public class WindowManagerService extends IWindowManager.Stub
                         pw.print(": "); pw.println(pair.second);
             }
         }
-        pw.println("  DisplayContents");
+        pw.println();
+        pw.println("  DisplayContents:");
         if (mDisplayReady) {
             DisplayContentsIterator dCIterator = new DisplayContentsIterator();
             while (dCIterator.hasNext()) {