Merge "Fix issue #7342364: JellyBean broke Toddler Lock, again" into jb-mr1-dev

Author: Dianne Hackborn

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) {

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()) {