Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56e75631 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

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

parents e1655c98 77119bc6

services/java/com/android/server/pm/PackageManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -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) {

services/java/com/android/server/wm/WindowManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -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()) {