From 91e8e6f70921e65eabf128f14b5d43385b22f0a1 Mon Sep 17 00:00:00 2001 From: Tony Mantler Date: Mon, 5 May 2014 13:59:39 -0700 Subject: [PATCH] Null check EmailServiceInfo b/14567915 Change-Id: I4780835a7f195f1a825a1538f9f1b939e2be4214 --- src/com/android/email/provider/EmailProvider.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/com/android/email/provider/EmailProvider.java b/src/com/android/email/provider/EmailProvider.java index bfcb4a1a1..b86bf11e0 100644 --- a/src/com/android/email/provider/EmailProvider.java +++ b/src/com/android/email/provider/EmailProvider.java @@ -1684,8 +1684,10 @@ public class EmailProvider extends ContentProvider { final String emailAddress = c.getString(INDEX_EMAIL_ADDRESS); final android.accounts.Account account = getAccountManagerAccount(context, emailAddress, protocol); - restartPush(account); - return true; + if (account != null) { + restartPush(account); + return true; + } } } } finally { @@ -5372,6 +5374,9 @@ public class EmailProvider extends ContentProvider { private static android.accounts.Account getAccountManagerAccount(final Context context, final String emailAddress, final String protocol) { final EmailServiceInfo info = EmailServiceUtils.getServiceInfo(context, protocol); + if (info == null) { + return null; + } return new android.accounts.Account(emailAddress, info.accountType); } @@ -5444,7 +5449,9 @@ public class EmailProvider extends ContentProvider { */ private void startSync(final Mailbox mailbox, final int deltaMessageCount) { final android.accounts.Account account = getAccountManagerAccount(mailbox.mAccountKey); - startSync(account, mailbox.mId, deltaMessageCount); + if (account != null) { + startSync(account, mailbox.mId, deltaMessageCount); + } } /**