Projects >> frameworks_base_disabled >>02d37b9731eaf5d79f9eb395576e030934c37f3b

Chunk
Conflicting content 
                || mExiting || mDestroying;
    }
        return mViewVisibility == View.GONE
                || !mRelayoutCalled
                || (atoken == null && mRootToken.hidden)
<<<<<<< HEAD
                || (atoken != null && (atoken.hiddenRequested || atoken.hidden))
=======
                || (atoken != null && atoken.hiddenRequested)
>>>>>>> 892d11f4925170543f166c38e594c97577b4c034
                || mAttachedHidden
Solution content 
        return mViewVisibility == View.GONE
                || !mRelayoutCalled
                || (atoken == null && mRootToken.hidden)
                || (atoken != null && atoken.hiddenRequested)
                || mAttachedHidden
                || mExiting || mDestroying;
    }
File
WindowState.java
Developer's decision
Version 2
Kind of conflict
Variable