Projects >> platform_frameworks_base >>fe1d52d572a750d548d7f573b3e4cac8cc08712f

Chunk
Conflicting content 
    private void initPrefs(Context context) {
        final ContentResolver contentResolver = context.getContentResolver();
        mResolver = new WeakReference(contentResolver);
<<<<<<< HEAD
=======

>>>>>>> 01937f63dc0e4071f0b6d7513ca31a28d2489181
        if (mObserver == null) {
            mObserver = new SettingsObserver();
            contentResolver.registerContentObserver(Settings.System.CONTENT_URI, true, mObserver);
Solution content 
    private void initPrefs(Context context) {
        final ContentResolver contentResolver = context.getContentResolver();
        mResolver = new WeakReference(contentResolver);
        if (mObserver == null) {
            mObserver = new SettingsObserver();
            contentResolver.registerContentObserver(Settings.System.CONTENT_URI, true, mObserver);
File
TextKeyListener.java
Developer's decision
Version 1
Kind of conflict
Blank