Fix issue #7342364: JellyBean broke Toddler Lock, again

Dianne Hackborn · Dianne Hackborn · commit 77119bc6c90a · 2012-10-23T15:02:25.000-07:00
Change-Id: I400c02711edc302a1bc7fbf98b62fcb9f76e5e12
diff --git a/services/java/com/android/server/pm/PackageManagerService.java b/services/java/com/android/server/pm/PackageManagerService.java
@@ -2522,7 +2522,8 @@ ResolveInfo findPreferredActivity(Intent intent, String resolvedType,
                     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
@@ -10561,7 +10561,8 @@ void dumpWindowsNoHeaderLocked(PrintWriter pw, boolean dumpAll,
                         pw.print(": "); pw.println(pair.second);
             }
         }
-        pw.println("  DisplayContents");
+        pw.println();
+        pw.println("  DisplayContents:");
         if (mDisplayReady) {
             DisplayContentsIterator dCIterator = new DisplayContentsIterator();
             while (dCIterator.hasNext()) {

Original file line number	Diff line number	Diff line change
`@@ -10561,7 +10561,8 @@ void dumpWindowsNoHeaderLocked(PrintWriter pw, boolean dumpAll,`
`10561`	`10561`	`pw.print(": "); pw.println(pair.second);`
`10562`	`10562`	`}`
`10563`	`10563`	`}`
`10564`		`- pw.println(" DisplayContents");`
	`10564`	`+ pw.println();`
	`10565`	`+ pw.println(" DisplayContents:");`
`10565`	`10566`	`if (mDisplayReady) {`
`10566`	`10567`	`DisplayContentsIterator dCIterator = new DisplayContentsIterator();`
`10567`	`10568`	`while (dCIterator.hasNext()) {`