Projects >> platform_frameworks_base >>dd7d7aacfea68dfd20a7b6d4be67777a7cfe2993

Chunk
Conflicting content 
            
            findBackground();

<<<<<<< HEAD
            if (!mParams.isForceNoDecor()) {
                findStatusBar();
                findActionBar();
                findNavBar();
            }
        }

=======
>>>>>>> de8da2793df3b3cb05215fa5dd02542548a54b9f
        private void findBackground() {
            if (!mParams.isBgColorOverridden()) {
                mWindowBackground = mResources.findItemInTheme(ATTR_WINDOW_BACKGROUND, true);
Solution content 
            
            findBackground();

            if (!mParams.isForceNoDecor()) {
                findStatusBar();
                findActionBar();
                findNavBar();
            }
        }

        private void findBackground() {
            if (!mParams.isBgColorOverridden()) {
                mWindowBackground = mResources.findItemInTheme(ATTR_WINDOW_BACKGROUND, true);
File
Layout.java
Developer's decision
Version 1
Kind of conflict
If statement