diff options
| author | Dianne Hackborn <hackbod@google.com> | 2012-10-23 17:35:41 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-23 17:35:59 -0700 |
| commit | 56e75631bd737e5362309330d4839cc1dddb501c (patch) | |
| tree | aa15506a68124bc16aa00dd27d7c1d4b5d67d181 | |
| parent | e1655c980d28b953597727d2c7832b442ca926cc (diff) | |
| parent | 77119bc6c90a62beb2f83d9496d99199a7aefe14 (diff) | |
| download | frameworks_base-56e75631bd737e5362309330d4839cc1dddb501c.zip frameworks_base-56e75631bd737e5362309330d4839cc1dddb501c.tar.gz frameworks_base-56e75631bd737e5362309330d4839cc1dddb501c.tar.bz2 | |
Merge "Fix issue #7342364: JellyBean broke Toddler Lock, again" into jb-mr1-dev
| -rw-r--r-- | services/java/com/android/server/pm/PackageManagerService.java | 3 | ||||
| -rwxr-xr-x | 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 66d2f24..9e2ad8e 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 1492b18..9511a1a 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()) { |