ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Fix NPE in onBasicsComplete" into ub-mail-master

Browse Source
This commit is contained in:
Jay Shrauner 2014-06-23 22:18:37 +00:00 committed by Android (Google) Code Review
commit 5417166477
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/email/activity/setup/AccountSetupFinal.java
View File

@ -767,7 +767,8 @@ public class AccountSetupFinal extends AccountSetupActivity
}
} else {
mIsPreConfiguredProvider = false;
final String existingAccountName = mExistingAccountsMap.get(email);
final String existingAccountName =
mExistingAccountsMap != null ? mExistingAccountsMap.get(email) : null;
if (!TextUtils.isEmpty(existingAccountName)) {
showDuplicateAccountDialog(existingAccountName);
return false;