commit a219d97d66b31d53f559e12b73924335349f88d8
author Alice Yang <alice@google.com> Wed Sep 04 00:30:28 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 04 00:30:28 2013 -0700
tree 1bee1b36401728bb4ca4c1f530b7b8d05f3508c6
parent c00056961faf2e2541f841107c0c6db6efed7e3f
parent bd698cd0f7689615bc53296342173c4817a0fb21

am bd698cd0: Merge "Revert "Revert "Prevent an NPE""" into jb-ub-mail-ur10

* commit 'bd698cd0f7689615bc53296342173c4817a0fb21':
  Revert "Revert "Prevent an NPE""

src/com/android/mail/browse/ConversationCursor.java

diff --git a/src/com/android/mail/browse/ConversationCursor.java b/src/com/android/mail/browse/ConversationCursor.java
index b648804..15457ab 100644
--- a/src/com/android/mail/browse/ConversationCursor.java
+++ b/src/com/android/mail/browse/ConversationCursor.java
@@ -1946,6 +1946,15 @@
     }
 
     @Override
+    public Uri getNotificationUri() {
+        if (mUnderlyingCursor == null) {
+            return null;
+        } else {
+            return mUnderlyingCursor.getNotificationUri();
+        }
+    }
+
+    @Override
     public void setNotificationUri(ContentResolver cr, Uri uri) {
         throw new UnsupportedOperationException();
     }