From 73a561fbbdcc09809f9588f3f0ad0ceaecd68685 Mon Sep 17 00:00:00 2001
From: Jay Shrauner <shrauner@google.com>
Date: Mon, 23 Jun 2014 15:10:11 -0700
Subject: [PATCH] Fix NPE in onBasicsComplete

Check for null mExistingAccountsMap as is done in finishAutoSetup().

Bug:15835752
Change-Id: I9e01d36990e107dc2c89f345c5e6f4565f071913
---
 src/com/android/email/activity/setup/AccountSetupFinal.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/android/email/activity/setup/AccountSetupFinal.java b/src/com/android/email/activity/setup/AccountSetupFinal.java
index 6c5d0231d..acbba4d0e 100644
--- a/src/com/android/email/activity/setup/AccountSetupFinal.java
+++ b/src/com/android/email/activity/setup/AccountSetupFinal.java
@@ -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;