Projects >> android-frameworks-base >>5704f326e00aa2ba8aa9b1df511747f6bd8dc3f7

Chunk
Conflicting content 
                    });
                }
            } else if (mHideLockScreen) {
<<<<<<< HEAD
                if (mKeyguard.hideLw(true)) {
                    mKeyguardMediator.setHidden(true);
=======
                if (mKeyguard.hideLw(false)) {
>>>>>>> 85e70956eb278761fa358ba2dc281e66b7852dda
                    changes |= FINISH_LAYOUT_REDO_LAYOUT
                            | FINISH_LAYOUT_REDO_CONFIG
                            | FINISH_LAYOUT_REDO_WALLPAPER;
Solution content 
                    });
                }
            } else if (mHideLockScreen) {
                if (mKeyguard.hideLw(true)) {
                    changes |= FINISH_LAYOUT_REDO_LAYOUT
                            | FINISH_LAYOUT_REDO_CONFIG
                            | FINISH_LAYOUT_REDO_WALLPAPER;
File
PhoneWindowManager.java
Developer's decision
Combination
Kind of conflict
If statement
Method invocation
Chunk
Conflicting content 
                }
                mKeyguardMediator.setHidden(true);
            } else {
<<<<<<< HEAD
                if (mKeyguard.showLw(true)) {
                    mKeyguardMediator.setHidden(false);
=======
                if (mKeyguard.showLw(false)) {
>>>>>>> 85e70956eb278761fa358ba2dc281e66b7852dda
                    changes |= FINISH_LAYOUT_REDO_LAYOUT
                            | FINISH_LAYOUT_REDO_CONFIG
                            | FINISH_LAYOUT_REDO_WALLPAPER;
Solution content 
                }
                mKeyguardMediator.setHidden(true);
            } else {
                if (mKeyguard.showLw(true)) {
                    changes |= FINISH_LAYOUT_REDO_LAYOUT
                            | FINISH_LAYOUT_REDO_CONFIG
                            | FINISH_LAYOUT_REDO_WALLPAPER;
File
PhoneWindowManager.java
Developer's decision
Combination
Kind of conflict
If statement
Method invocation