Projects >> android-frameworks-base-with-screenshot-tweaks >>b75fa30aaf03d9e425d150b452501e5df0621351

Chunk
Conflicting content 
    }

    void dispatchDetachedFromWindow() {
<<<<<<< HEAD
=======
        if (Config.LOGV) Log.v(TAG, "Detaching in " + this + " of " + mSurface);

>>>>>>> aca672ba2eea19420df16906851d56077a3fd3b2
        if (mView != null) {
            mView.dispatchDetachedFromWindow();
        }
Solution content 
    }

    void dispatchDetachedFromWindow() {
        if (mView != null) {
            mView.dispatchDetachedFromWindow();
        }
File
ViewRoot.java
Developer's decision
Version 1
Kind of conflict
If statement
Chunk
Conflicting content 
    void doDie() {
        checkThread();
<<<<<<< HEAD
        if (LOCAL_LOGV) Log.v("ViewRoot", "DIE in " + this + " of " + mSurface);
=======
        if (Config.LOGV) Log.v(TAG, "DIE in " + this + " of " + mSurface);
>>>>>>> aca672ba2eea19420df16906851d56077a3fd3b2
        synchronized (this) {
            if (mAdded && !mFirst) {
                int viewVisibility = mView.getVisibility();
Solution content 
    void doDie() {
        checkThread();
        if (LOCAL_LOGV) Log.v(TAG, "DIE in " + this + " of " + mSurface);
        synchronized (this) {
            if (mAdded && !mFirst) {
                int viewVisibility = mView.getVisibility();
File
ViewRoot.java
Developer's decision
Manual
Kind of conflict
If statement