am 03f1239a: Merge "Revert "Revert "Fix hierarchical folders""" into jb-ub-mail-ur10
* commit '03f1239aec39f8e3e3ade0e8c78df5836d5f4fc2':
Revert "Revert "Fix hierarchical folders""
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();
}