diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-12-15 03:00:08 -0700 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2016-12-15 03:00:08 -0700 |
| commit | 4063ddf7371a61c1aea0364124af58e4511a943b (patch) | |
| tree | 74c9c5eb3af11f4bb05607ed55d30a3d2b7c7037 | |
| parent | d4c97ca06c1020a2abd45be12dfca1161d24d373 (diff) | |
| parent | 8698473fab536f19182fa5c4ae1cfac0c3a85723 (diff) | |
| download | android_packages_apps_UnifiedEmail-4063ddf7371a61c1aea0364124af58e4511a943b.tar.gz android_packages_apps_UnifiedEmail-4063ddf7371a61c1aea0364124af58e4511a943b.tar.bz2 android_packages_apps_UnifiedEmail-4063ddf7371a61c1aea0364124af58e4511a943b.zip | |
Merge 8698473fab536f19182fa5c4ae1cfac0c3a85723 on remote branch
Change-Id: I3b2270772ba1dc9a9186683faf9ae7f44e784997
| -rw-r--r-- | src/com/android/mail/browse/ConversationItemView.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/mail/browse/ConversationItemView.java b/src/com/android/mail/browse/ConversationItemView.java index d4a8d2941..00edff4b3 100644 --- a/src/com/android/mail/browse/ConversationItemView.java +++ b/src/com/android/mail/browse/ConversationItemView.java @@ -575,7 +575,7 @@ public class ConversationItemView extends View Utils.traceEndSection(); final int ignoreFolderType; - if (mDisplayedFolder.isInbox()) { + if (mDisplayedFolder != null && mDisplayedFolder.isInbox()) { ignoreFolderType = FolderType.INBOX; } else { ignoreFolderType = -1; |