commit 0e368b0a34f8e469bd57d5da5860f5f2a668c7ce
author Tingting Wang <tingtingw@google.com> Wed Nov 25 23:23:59 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 25 23:23:59 2015 +0000
tree e3c5d104288b307bf1169a10d2e869b7579f7e62
parent 2795a88a8e89a44f7dc4334cc2ae00bbd19dc2c1
parent 4abdee91084b6ee89f1ef1a8b797a5a2e0272059

Merge "Set default account when there's only one writable account." into ub-contactsdialer-b-dev

src/com/android/contacts/editor/ContactEditorUtils.java

diff --git a/src/com/android/contacts/editor/ContactEditorUtils.java b/src/com/android/contacts/editor/ContactEditorUtils.java
index 93fa8a3..728211f 100644
--- a/src/com/android/contacts/editor/ContactEditorUtils.java
+++ b/src/com/android/contacts/editor/ContactEditorUtils.java
@@ -148,6 +148,11 @@
      * Also note that the returned account may have been removed already.
      */
     public AccountWithDataSet getDefaultAccount() {
+        final List<AccountWithDataSet> currentWritableAccounts = getWritableAccounts();
+        if (currentWritableAccounts.size() == 1) {
+            return currentWritableAccounts.get(0);
+        }
+
         final String saved = mPrefs.getString(mDefaultAccountKey, null);
         if (TextUtils.isEmpty(saved)) {
             return null;