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

Commit 2755644d authored by Wale Ogunwale's avatar Wale Ogunwale Committed by Android (Google) Code Review
Browse files

Merge "Fix build breakage from missing close brace." into lmp-mr1-dev

parents 7d0d2f6c 1dfab89a

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

+5 −4
Original line number Diff line number Diff line
@@ -333,8 +333,9 @@ public class WindowAnimator { 
                            + " hidden=" + win.mRootToken.hidden

                            + " anim=" + win.mWinAnimator.mAnimation);

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

                    final boolean hideWhenLocked = !((win.mIsImWindow || imeTarget == win) && showImeOverKeyguard) ||

                            (appShowWhenLocked != null && (appShowWhenLocked == win.mAppToken ||

                    final boolean hideWhenLocked =

                            !(((win.mIsImWindow || imeTarget == win) && showImeOverKeyguard)

                            || (appShowWhenLocked != null && (appShowWhenLocked == win.mAppToken ||

                            // Show error dialogs over apps that dismiss keyguard.

                            (win.mAttrs.privateFlags & PRIVATE_FLAG_SYSTEM_ERROR) != 0)));

                    if (((mForceHiding == KEYGUARD_ANIMATING_IN)