Projects >> android-frameworks-base >>85a2c7f1cad8fd55ed72a8a3dbb2b36632ebbff3

Chunk
Conflicting content 
                    mInProgressX = x;
                    mInProgressY = y;

<<<<<<< HEAD
                    if (mPatternInProgress && patternSize > 0) {
=======
                    if (mPatternInProgress) {
                        if (mPattern.isEmpty()) return false;

>>>>>>> 0369a7c3ac97b4791716ddd183e83309b1455476
                        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 1
Kind of conflict
If statement