Projects >> platform_frameworks_base >>735f45538650728e9ca9856b9ff87ec54c972f04

Chunk
Conflicting content 
        mMessageHandler = new MessageHandler(mMessageThread.getLooper());

        mAuthenticatorCache = new AccountAuthenticatorCache(mContext);
<<<<<<< HEAD
        mAuthenticatorCache.setListener(this);
=======
        mAuthenticatorCache.setListener(this, null /* Handler */);
        mBindHelper = new AuthenticatorBindHelper(mContext, mAuthenticatorCache, mMessageHandler,
                MESSAGE_CONNECTED, MESSAGE_DISCONNECTED);
>>>>>>> ae0cf6dc9eb92282ef92b00ac68bfaca8aad2a1e

        mSimWatcher = new SimWatcher(mContext);
        sThis.set(this);
Solution content 
        mMessageHandler = new MessageHandler(mMessageThread.getLooper());

        mAuthenticatorCache = new AccountAuthenticatorCache(mContext);
        mAuthenticatorCache.setListener(this, null /* Handler */);

        mSimWatcher = new SimWatcher(mContext);
        sThis.set(this);
File
AccountManagerService.java
Developer's decision
Combination
Kind of conflict
Attribute
Method invocation