commit f9dda1ee9be4db8b2bc4dad25230bdbff1df147b
author Scott Kennedy <skennedy@google.com> Tue Sep 03 15:27:13 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 03 15:27:13 2013 -0700
tree fe729042aa91b134a033766e6c254ecb7b37e239
parent 8d8bf8a7240ecb5486a94710cec945a8bda6b156
parent e623fa221d73a5337b2fb38f1bb501ee8a3f4b10

am e623fa22: Merge "Preserve advertiser name" into jb-ub-mail-ur10

* commit 'e623fa221d73a5337b2fb38f1bb501ee8a3f4b10':
  Preserve advertiser name

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