diff options
| author | Yu Ping Hu <yph@google.com> | 2013-09-29 21:16:21 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-29 21:16:21 -0700 |
| commit | 3e1825432644f915c2ff54d84622c11fbb2212bf (patch) | |
| tree | 9bf66dabef80dde7b606f4155a38126563de5565 | |
| parent | d5706a487248fbaeeb4c2c397aa5c44ccfb9908a (diff) | |
| parent | 125cbdf9d4dbc30127d99b56c9c025fab70aa358 (diff) | |
| download | android_packages_apps_Email-3e1825432644f915c2ff54d84622c11fbb2212bf.tar.gz android_packages_apps_Email-3e1825432644f915c2ff54d84622c11fbb2212bf.tar.bz2 android_packages_apps_Email-3e1825432644f915c2ff54d84622c11fbb2212bf.zip | |
am 125cbdf9: Make certain we don\'t use a null account.
* commit '125cbdf9d4dbc30127d99b56c9c025fab70aa358':
Make certain we don't use a null account.
| -rw-r--r-- | src/com/android/email/provider/EmailProvider.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/com/android/email/provider/EmailProvider.java b/src/com/android/email/provider/EmailProvider.java index 8de78e6dc..d195f1c55 100644 --- a/src/com/android/email/provider/EmailProvider.java +++ b/src/com/android/email/provider/EmailProvider.java @@ -5249,10 +5249,13 @@ public class EmailProvider extends ContentProvider { public boolean handleMessage(android.os.Message msg) { synchronized (mDelayedSyncRequests) { final SyncRequestMessage request = (SyncRequestMessage) msg.obj; - final Bundle extras = new Bundle(); - extras.putLong(Mailbox.SYNC_EXTRA_MAILBOX_ID, request.mMailboxId); - ContentResolver.requestSync(getAccountManagerAccount(request.mAccountId), - request.mAuthority, extras); + final android.accounts.Account account = + getAccountManagerAccount(request.mAccountId); + if (account != null) { + final Bundle extras = new Bundle(); + extras.putLong(Mailbox.SYNC_EXTRA_MAILBOX_ID, request.mMailboxId); + ContentResolver.requestSync(account, request.mAuthority, extras); + } mDelayedSyncRequests.remove(request); return true; } |