Add local phone account as a writable AccountTypes.

Previously, the local account can be used to create contacts but not groups. Fix this by ensuring
that the local account is added as a contact writable account as well as a group writable account.

Change-Id: Ia4e0a8abca42d12a708a9e56a181fd3677e56aba

2 files changed, 6 insertions, 4 deletions

diff --git a/src/com/android/contacts/common/model/AccountTypeManager.java b/src/com/android/contacts/common/model/AccountTypeManager.java
index 86d6a06e..d12e47f9 100644
--- a/src/com/android/contacts/common/model/AccountTypeManager.java
+++ b/src/com/android/contacts/common/model/AccountTypeManager.java
@@ -465,6 +465,12 @@ class AccountTypeManagerImpl extends AccountTypeManager
         AccountType localAccountType = new PhoneAccountType(mContext, mContext.getPackageName());
         addAccountType(localAccountType, accountTypesByTypeAndDataSet, accountTypesByType);
 
+        AccountWithDataSet localAccountWithDataSet = new AccountWithDataSet(
+            PhoneAccountType.ACCOUNT_NAME, PhoneAccountType.ACCOUNT_TYPE, null);
+        allAccounts.add(localAccountWithDataSet);
+        contactWritableAccounts.add(localAccountWithDataSet);
+        groupWritableAccounts.add(localAccountWithDataSet);
+
         // If any extension packages were specified, process them as well.
         if (!extensionPackages.isEmpty()) {
             Log.d(TAG, "Registering " + extensionPackages.size() + " extension packages");
diff --git a/src/com/android/contacts/common/util/AccountsListAdapter.java b/src/com/android/contacts/common/util/AccountsListAdapter.java
index 15af0aba..e1986f2a 100755
--- a/src/com/android/contacts/common/util/AccountsListAdapter.java
+++ b/src/com/android/contacts/common/util/AccountsListAdapter.java
@@ -68,10 +68,6 @@ public final class AccountsListAdapter extends BaseAdapter {
         mAccountTypes = AccountTypeManager.getInstance(context);
         mAccounts = getAccounts(accountListFilter);
 
-        // Add the virtual local storage account to allow user to store its contacts in the phone
-        mAccounts.add(0, new AccountWithDataSet(PhoneAccountType.ACCOUNT_NAME,
-                                                PhoneAccountType.ACCOUNT_TYPE,
-                                                null));
         if (currentAccount != null
                 && !mAccounts.isEmpty()
                 && !mAccounts.get(0).equals(currentAccount)