commit 9410e405caab6740fa981cb2d90c8e9259dba7ce
author Alice Yang <alice@google.com> Wed Sep 04 00:30:30 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 04 00:30:30 2013 -0700
tree d8711fe43d637cde27f6007209f78ab97403cd41
parent aac88d664d7260dcd40485d0f4aafe2f0275d123
parent 7f8ce7c946b28c2d4ef238fa43d0cf101b53cb21

am 7f8ce7c9: Merge "Revert "Revert "NPE in TwoPaneController""" into jb-ub-mail-ur10

* commit '7f8ce7c946b28c2d4ef238fa43d0cf101b53cb21':
  Revert "Revert "NPE in TwoPaneController""

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();
     }