commit b9a6f8033a3be0b91ce961be671caaac3e3ad235
author Andrew Sapperstein <asapperstein@google.com> Sun Nov 02 19:52:54 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sun Nov 02 19:52:54 2014 +0000
tree a4d4aec689cd583a40b75c33da257a2891e5ea17
parent fd330693c815b8c88003144ff1d170aacc5c01e4
parent 2503ca0e980e8bdab95291840b37f80137c1a585

am 2503ca0e: am 769ad2a9: am 2585ad6c: am 8c601e4f: Prevent NPE. Fixes b/17639380.

* commit '2503ca0e980e8bdab95291840b37f80137c1a585':
  Prevent NPE. Fixes b/17639380.

src/com/android/mail/ui/ConversationViewFragment.java

diff --git a/src/com/android/mail/ui/ConversationViewFragment.java b/src/com/android/mail/ui/ConversationViewFragment.java
index 3e68841..c53264b 100644
--- a/src/com/android/mail/ui/ConversationViewFragment.java
+++ b/src/com/android/mail/ui/ConversationViewFragment.java
@@ -1062,7 +1062,10 @@
     @Override
     public void showUntransformedConversation() {
         super.showUntransformedConversation();
-        renderConversation(getMessageCursor());
+        final MessageCursor cursor = getMessageCursor();
+        if  (cursor != null) {
+            renderConversation(cursor);
+        }
     }
 
     @Override