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

Merge "Null check EmailServiceInfo" into ub-mail-master

This commit is contained in:
Tony Mantler 2014-05-05 23:07:13 +00:00 committed by Android (Google) Code Review
parent aab514c942 91e8e6f709
commit ddfdb5d11d
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/email/provider/EmailProvider.java
View File

@ -1684,8 +1684,10 @@ public class EmailProvider extends ContentProvider {
final String emailAddress = c.getString(INDEX_EMAIL_ADDRESS); final String emailAddress = c.getString(INDEX_EMAIL_ADDRESS);
final android.accounts.Account account = final android.accounts.Account account =
getAccountManagerAccount(context, emailAddress, protocol); getAccountManagerAccount(context, emailAddress, protocol);
restartPush(account); if (account != null) {
return true; restartPush(account);
return true;
}
} }
} }
} finally { } finally {
@ -5372,6 +5374,9 @@ public class EmailProvider extends ContentProvider {
private static android.accounts.Account getAccountManagerAccount(final Context context, private static android.accounts.Account getAccountManagerAccount(final Context context,
final String emailAddress, final String protocol) { final String emailAddress, final String protocol) {
final EmailServiceInfo info = EmailServiceUtils.getServiceInfo(context, protocol); final EmailServiceInfo info = EmailServiceUtils.getServiceInfo(context, protocol);
if (info == null) {
return null;
}
return new android.accounts.Account(emailAddress, info.accountType); 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) { private void startSync(final Mailbox mailbox, final int deltaMessageCount) {
final android.accounts.Account account = getAccountManagerAccount(mailbox.mAccountKey); final android.accounts.Account account = getAccountManagerAccount(mailbox.mAccountKey);
startSync(account, mailbox.mId, deltaMessageCount); if (account != null) {
startSync(account, mailbox.mId, deltaMessageCount);
}
} }
/** /**