commit abd69d12d4be7613a0636bc9fd4dccd30a2ee327
author Scott Kennedy <skennedy@google.com> Wed Sep 04 20:56:18 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 04 20:56:18 2013 -0700
tree 99561d29521c8c3ebfea489c73d29805d8ac6394
parent 3278695d62b69ed13faa6d111182778f298ce1d4
parent 9bc947a8d0f99405778ede016953fbe6db9db9c1

am 9bc947a8: Merge "Allow going back to search results" into jb-ub-mail-ur10

* commit '9bc947a8d0f99405778ede016953fbe6db9db9c1':
  Allow going back to search results

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