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

Commit 02d37b97 authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

resolved conflicts for merge of 892d11f4 to master 

Change-Id: I21eca0002100d898e167a25aaa46d896deca2a11
parents 65f87ec7 892d11f4

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

+1 −1
Original line number Diff line number Diff line
@@ -1449,7 +1449,7 @@ final class WindowState implements WindowManagerPolicy.WindowState { 
        return mViewVisibility == View.GONE

                || !mRelayoutCalled

                || (atoken == null && mRootToken.hidden)

                || (atoken != null && (atoken.hiddenRequested || atoken.hidden))

                || (atoken != null && atoken.hiddenRequested)

                || mAttachedHidden

                || mExiting || mDestroying;

    }