commit f5eeb90da7230e0dfccdeb764302f080040765ff
author Alice Yang <alice@google.com> Wed Sep 04 00:30:31 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 04 00:30:31 2013 -0700
tree 4c152c3721feefde0fa9a7b4e12bce3348849b04
parent 9410e405caab6740fa981cb2d90c8e9259dba7ce
parent 535af3345aa5caab4e2b47dd3b1539a301dbab1d

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

* commit '535af3345aa5caab4e2b47dd3b1539a301dbab1d':
  Revert "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();
     }