Projects >> android_frameworks_base >>ed51bf803a1cc12e66b7e03d2a2d89c3ee04fe51

Chunk
Conflicting content 
                boolean hasSoftInput = imId != null && imId.length() > 0;
                if (mHasSoftInput != hasSoftInput) {
                    mHasSoftInput = hasSoftInput;
<<<<<<< HEAD
                    updateRotation = true;
=======
                    updateRotation(0);
>>>>>>> 2119469e8dfce45a809212fc25606261c6eeddca
                }
            }
            if (updateRotation) {
Solution content 
                    mHasSoftInput = hasSoftInput;
                    updateRotation = true;
                }
            }
            if (updateRotation) {
                boolean hasSoftInput = imId != null && imId.length() > 0;
                if (mHasSoftInput != hasSoftInput) {
File
PhoneWindowManager.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable