diff options
| author | Jorge Ruesga <jorge@ruesga.com> | 2014-07-20 13:36:48 +0200 |
|---|---|---|
| committer | Jorge Ruesga <jorge@ruesga.com> | 2014-07-20 13:36:52 +0200 |
| commit | f1caeb5e090cdc1e6f00a979a4f930eb81ddd6dd (patch) | |
| tree | f7f83e39ea4caf77a8e811c9868651fc20a59c7a | |
| parent | 961079793f7d6794b97437ee7b20d1646a5e4ca8 (diff) | |
| download | android_packages_apps_UnifiedEmail-f1caeb5e090cdc1e6f00a979a4f930eb81ddd6dd.tar.gz android_packages_apps_UnifiedEmail-f1caeb5e090cdc1e6f00a979a4f930eb81ddd6dd.tar.bz2 android_packages_apps_UnifiedEmail-f1caeb5e090cdc1e6f00a979a4f930eb81ddd6dd.zip | |
email: prevent NPE caused by null cursors
Change-Id: If819f14d4cf25d6ba35110a7a22125909a6f87dc
JIRA: CYAN-4577
Issue: https://jira.cyanogenmod.org/browse/CYAN-4577
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
| -rw-r--r-- | src/com/android/mail/utils/NotificationUtils.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/mail/utils/NotificationUtils.java b/src/com/android/mail/utils/NotificationUtils.java index bfaa16ce4..9a0caf945 100644 --- a/src/com/android/mail/utils/NotificationUtils.java +++ b/src/com/android/mail/utils/NotificationUtils.java @@ -172,6 +172,9 @@ public class NotificationUtils { final Uri accountUri = Uri.parse(notificationParts[0]); final Cursor accountCursor = context.getContentResolver().query( accountUri, UIProvider.ACCOUNTS_PROJECTION, null, null, null); + if (accountCursor == null) { + continue; + } final Account account; try { if (accountCursor.moveToFirst()) { @@ -186,6 +189,9 @@ public class NotificationUtils { final Uri folderUri = Uri.parse(notificationParts[1]); final Cursor folderCursor = context.getContentResolver().query( folderUri, UIProvider.FOLDERS_PROJECTION, null, null, null); + if (folderCursor == null) { + continue; + } final Folder folder; try { if (folderCursor.moveToFirst()) { |