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

Commit 9b2ffab7 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by android-build-merger
Browse files

resolve merge conflicts of 2755644d to lmp-mr1-ub-dev. automerge: 89b3ecc7 

automerge: 2a32d9f6

* commit '2a32d9f6':
  Fix build breakage from missing close brace.
parents 45670c1d 2a32d9f6

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

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

                            + " hidden=" + win.mRootToken.hidden

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

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

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

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

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

                    final boolean hideWhenLocked =

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

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

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

                            // Show error dialogs over apps that dismiss keyguard.

                            // Show error dialogs over apps that dismiss keyguard.

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

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

                    if (((mForceHiding == KEYGUARD_ANIMATING_IN)

                    if (((mForceHiding == KEYGUARD_ANIMATING_IN)