Projects >> android_frameworks_base >>f6a34dd6ab7f4803a2bbfed1cc8910e879e6a79d

Chunk
Conflicting content 
import org.xmlpull.v1.XmlPullParserException;
import org.xmlpull.v1.XmlSerializer;

<<<<<<< HEAD
import android.accounts.Account;
=======
import android.backup.IBackupManager;
>>>>>>> b71951591d72cddb4dbc3d39778dfcb5597a5733
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteException;
Solution content 
import org.xmlpull.v1.XmlPullParserException;
import org.xmlpull.v1.XmlSerializer;

import android.accounts.Account;
import android.backup.IBackupManager;
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteException;
File
SyncStorageEngine.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
            }
        }
    }
<<<<<<< HEAD
    
    public boolean getSyncAutomatically(Account account, String providerName) {
=======

    public boolean getSyncProviderAutomatically(String account, String providerName) {
>>>>>>> b71951591d72cddb4dbc3d39778dfcb5597a5733
        synchronized (mAuthorities) {
            if (account != null) {
                AuthorityInfo authority = getAuthorityLocked(account, providerName,
Solution content 
            }
        }
    }

    public boolean getSyncAutomatically(Account account, String providerName) {
        synchronized (mAuthorities) {
            if (account != null) {
                AuthorityInfo authority = getAuthorityLocked(account, providerName,
File
SyncStorageEngine.java
Developer's decision
Version 1
Kind of conflict
Method signature