commit c2d1aa9fcb709a0e6a71d9ff7edc6e6bf6b70958
author Andrew Sapperstein <asapperstein@google.com> Tue Sep 03 15:34:29 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 03 15:34:29 2013 -0700
tree 6ad417cd9f30f926e0a16fa894609fa325dc2157
parent f9dda1ee9be4db8b2bc4dad25230bdbff1df147b
parent 8f580078c51cd4b116d48323c209f7f803ad7f46

am 8f580078: Merge "Delete CAN_HOLD_MAIL folder capability." into jb-ub-mail-ur10

* commit '8f580078c51cd4b116d48323c209f7f803ad7f46':
  Delete CAN_HOLD_MAIL folder capability.

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