Projects >> frameworks_base_disabled >>221cb2a6ca8a187fbe35f465df640a68ed2feaed

Chunk
Conflicting content 
        if (mNativeClass == 0) {
            return;
        }
<<<<<<< HEAD

=======
>>>>>>> 6dc9232c1c9a7ddffba24d4bd218e46894f8414d
        int saveCount = canvas.save();
        if (mTitleBar != null) {
            canvas.translate(0, (int) mTitleBar.getHeight());
Solution content 
        if (mNativeClass == 0) {
            return;
        }

        int saveCount = canvas.save();
        if (mTitleBar != null) {
            canvas.translate(0, (int) mTitleBar.getHeight());
File
WebView.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
                    mDragTrackerHandler.dragTo(x, y);
                }

<<<<<<< HEAD
                if (keepScrollBarsVisible) {
                    if (mHeldMotionless != MOTIONLESS_TRUE) {
                        mHeldMotionless = MOTIONLESS_TRUE;
                        invalidate();
                    }
=======
                if (done) {
>>>>>>> 6dc9232c1c9a7ddffba24d4bd218e46894f8414d
                    // keep the scrollbar on the screen even there is no scroll
                    awakenScrollBars(ViewConfiguration.getScrollDefaultDelay(),
                            false);
Solution content 
                    mDragTrackerHandler.dragTo(x, y);
                }

                if (keepScrollBarsVisible) {
                    if (mHeldMotionless != MOTIONLESS_TRUE) {
                        mHeldMotionless = MOTIONLESS_TRUE;
                        invalidate();
                    }
                    // keep the scrollbar on the screen even there is no scroll
                    awakenScrollBars(ViewConfiguration.getScrollDefaultDelay(),
                            false);
File
WebView.java
Developer's decision
Version 1
Kind of conflict
If statement