Projects >> providers_contacts >>d50f427f4714e81333ee7599f1882b035aa873d6

Chunk
Conflicting content 
    }

    public static final String DEFAULT_ACCOUNT_TYPE = "com.google.GAIA";
<<<<<<< HEAD
    public static final String FEATURE_APPS_FOR_DOMAIN = "hosted_or_google";
=======
    public static final String FEATURE_LEGACY_HOSTED_OR_GOOGLE = "legacy_hosted_or_google";
>>>>>>> df9fd6b239de5829b04cb413e4dfa3e6da649c38

    /** Contains just the contacts columns
     * @deprecated*/
Solution content 
    }

    public static final String DEFAULT_ACCOUNT_TYPE = "com.google.GAIA";
    public static final String FEATURE_LEGACY_HOSTED_OR_GOOGLE = "legacy_hosted_or_google";

    /** Contains just the contacts columns
     * @deprecated*/
File
ContactsProvider2.java
Developer's decision
Version 2
Kind of conflict
Attribute
Chunk
Conflicting content 
    protected Account getDefaultAccount() {
        AccountManager accountManager = AccountManager.get(getContext());
        try {
<<<<<<< HEAD
            String[] features = new String[] {FEATURE_APPS_FOR_DOMAIN};
            Account[] accounts = accountManager.getAccountsByTypeAndFeatures(
                    DEFAULT_ACCOUNT_TYPE, features, null, null).getResult();
=======
            Account[] accounts = accountManager.getAccountsByTypeAndFeatures(DEFAULT_ACCOUNT_TYPE,
                    new String[] {FEATURE_LEGACY_HOSTED_OR_GOOGLE}, null, null).getResult();
>>>>>>> df9fd6b239de5829b04cb413e4dfa3e6da649c38
            if (accounts != null && accounts.length > 0) {
                return accounts[0];
            }
Solution content 
    protected Account getDefaultAccount() {
        AccountManager accountManager = AccountManager.get(getContext());
        try {
            Account[] accounts = accountManager.getAccountsByTypeAndFeatures(DEFAULT_ACCOUNT_TYPE,
                    new String[] {FEATURE_LEGACY_HOSTED_OR_GOOGLE}, null, null).getResult();
            if (accounts != null && accounts.length > 0) {
                return accounts[0];
            }
File
ContactsProvider2.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable