commit d0bedf51a1e2c16cd1585a9741310bc3e0b0f3f6
author Marcus Hagerott <mhagerott@google.com> Wed Nov 02 01:33:14 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 02 01:33:14 2016 +0000
tree deeeab55fc55ced468cf067ff229762d5381172f
parent d2c9b69e1f341587bd484154bfb3f05905d05b8b
parent d7a5c2a7f795980212dce4a833c96729fee200cb

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

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

diff --git a/src/com/android/contacts/common/model/account/AccountWithDataSet.java b/src/com/android/contacts/common/model/account/AccountWithDataSet.java
index 37f6652..3ee0aab 100644
--- a/src/com/android/contacts/common/model/account/AccountWithDataSet.java
+++ b/src/com/android/contacts/common/model/account/AccountWithDataSet.java
@@ -243,9 +243,13 @@
     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();