Projects >> platform_frameworks_base >>3c0365518f3f664634ed0f9464c351acf3b7e86d

Chunk
Conflicting content 
                PixelFormat.RGBX_8888);
        lp.gravity = getStatusBarGravity();
        lp.setTitle("StatusBar");
<<<<<<< HEAD
        // TODO lp.windowAnimations = R.style.Animation_StatusBar;
        WindowManagerImpl.getDefault().addView(sb, lp);
=======
        lp.windowAnimations = com.android.internal.R.style.Animation_StatusBar;
>>>>>>> 0ad4a77cb78348951c349ba92ec858bfb26aeb33

        Slog.d(TAG, "Added status bar view w/ gravity 0x" + Integer.toHexString(lp.gravity));
    }
Solution content 
                PixelFormat.RGBX_8888);
        lp.gravity = getStatusBarGravity();
        lp.setTitle("StatusBar");
        // TODO lp.windowAnimations = R.style.Animation_StatusBar;
        WindowManagerImpl.getDefault().addView(sb, lp);

        Slog.d(TAG, "Added status bar view w/ gravity 0x" + Integer.toHexString(lp.gravity));
    }
File
StatusBarService.java
Developer's decision
Version 1
Kind of conflict
Comment
Method invocation
Variable