Contacts: Fix pops up twice same account selection dialog
Pops up twice same account selection dialog when import contacts
to device account. The device account's name and type are "null".
When select device account and it is judged as a invalid account,
so needs user to select the account again and leads to this issue.
Add selecting device account scenario to fix this issue.
Change-Id: Ib524aff72657b5905e7640817872f19b91987bd2
CRs-Fixed: 2494912
diff --git a/src/com/android/contacts/vcard/ImportVCardActivity.java b/src/com/android/contacts/vcard/ImportVCardActivity.java
old mode 100644
new mode 100755
index 2c69cdf..0353716
--- a/src/com/android/contacts/vcard/ImportVCardActivity.java
+++ b/src/com/android/contacts/vcard/ImportVCardActivity.java
@@ -595,6 +595,8 @@
if (!TextUtils.isEmpty(accountName) && !TextUtils.isEmpty(accountType)) {
mAccount = new AccountWithDataSet(accountName, accountType, dataSet);
+ } if (accountName == null && accountType == null && dataSet == null){
+ mAccount = AccountWithDataSet.getNullAccount();
} else {
final AccountTypeManager accountTypes = AccountTypeManager.getInstance(this);
final List<AccountWithDataSet> accountList = accountTypes.blockForWritableAccounts();