commit 3278695d62b69ed13faa6d111182778f298ce1d4
author Scott Kennedy <skennedy@google.com> Wed Sep 04 18:45:44 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 04 18:45:44 2013 -0700
tree 7f5c8a3afd8e74de7ea38c0384b7ad7d9244234f
parent 043598f6b31e443e83107b0b12d2537416c6e026
parent 2551bcfb449a902a99a593390e90598d6e5f9fbc

am 2551bcfb: Merge "Remember our scroll position when we return to conv list" into jb-ub-mail-ur10

* commit '2551bcfb449a902a99a593390e90598d6e5f9fbc':
  Remember our scroll position when we return to conv list

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