Projects >> android_frameworks_base >>be8e36e32b9cb2bb37e28e4c0d414ee0e46c84a2

Chunk
Conflicting content 
                    mInProgressX = x;
                    mInProgressY = y;

<<<<<<< HEAD
                    if (mPatternInProgress) {
                        if (mPattern.isEmpty()) return false;

=======
                    if (mPatternInProgress && patternSize > 0) {
>>>>>>> 8f4b5a561813ee8c22d2b8e73c33299471d4a3f3
                        final ArrayList pattern = mPattern;
                        final float radius = mSquareWidth * mDiameterFactor * 0.5f;
Solution content 
                    mInProgressX = x;
                    mInProgressY = y;

                    if (mPatternInProgress && patternSize > 0) {
                        final ArrayList pattern = mPattern;
                        final float radius = mSquareWidth * mDiameterFactor * 0.5f;
File
LockPatternView.java
Developer's decision
Version 2
Kind of conflict
If statement