commit 5a44d87a14e8d9778da7248627cc9948524a044e
author Alice Yang <alice@google.com> Tue Sep 03 14:58:59 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 03 14:58:59 2013 -0700
tree 6754d8257217c0712e0e0adacead167446bb616e
parent 3a644641997c39d906783629320bc487872f671e
parent 784f9e928f0b1e38f6cc94d7f201258ef573f40b

am 784f9e92: Merge "Revert "Exit cab mode when we change folders"" into jb-ub-mail-ur10

* commit '784f9e928f0b1e38f6cc94d7f201258ef573f40b':
  Revert "Exit cab mode when we change folders"

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