Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '56e75631bd737e5362309330d4839cc1dddb501c':
  Fix issue #7342364: JellyBean broke Toddler Lock, again
This commit is contained in:
Dianne Hackborn
2012-10-23 17:38:54 -07:00
committed by Android Git Automerger
parent 444fc17f4b 56e75631bd
commit d4337ae09b
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/java/com/android/server/pm/PackageManagerService.java
View File

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

3
services/java/com/android/server/wm/WindowManagerService.java
View File

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