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

Commit ba523324 authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

am ab1c5456: Merge "Keep launcher screen from flashing over lockscreen" into jb-dev 

* commit 'ab1c5456':
  Keep launcher screen from flashing over lockscreen
parents 791044c2 ab1c5456

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

+1 −1
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ public class WindowAnimator { 
                                mPendingLayoutChanges);

                        }

                        mService.mFocusMayChange = true;

                    } else if (win.isReadyForDisplay() && winAnimator.mAnimation == null) {

                    } else if (win.isReadyForDisplay()) {

                        mForceHiding = true;

                    }

                } else if (mPolicy.canBeForceHidden(win, win.mAttrs)) {