Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0bedf51 authored by Marcus Hagerott's avatar Marcus Hagerott Committed by Android (Google) Code Review
Browse files

Merge "Don't show "device" on SIM import after account added" into ub-contactsdialer-h-dev

parents d2c9b69e d7a5c2a7

src/com/android/contacts/common/model/account/AccountWithDataSet.java

+6 −2
Original line number Diff line number Diff line
@@ -243,9 +243,13 @@ public class AccountWithDataSet implements Parcelable { 
    public static AccountWithDataSet getDefaultOrBestFallback(ContactsPreferences preferences,

            AccountTypeManager accountTypeManager) {

        if (preferences.isDefaultAccountSet()) {

            return preferences.getDefaultAccount();

            final AccountWithDataSet account = preferences.getDefaultAccount();

            if (accountTypeManager.contains(account, true)) {

                return account;

            }

        }

        List<AccountWithDataSet> accounts = accountTypeManager.getAccounts(/* writableOnly */ true);

        final List<AccountWithDataSet> accounts = accountTypeManager

                .getAccounts(/* writableOnly */ true);



        if (accounts.isEmpty()) {

            return AccountWithDataSet.getNullAccount();