commit 87a6590173d457c0a05bd16423faba3e5fbedee7
author Scott Kennedy <skennedy@google.com> Thu Mar 21 00:33:22 2013 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Mar 21 00:33:22 2013 +0000
tree 35f64b27f78792d41413397d2c57e7d2b5b7b012
parent 7fc634ee4266b80580116914ffd26940d4558c6f
parent 447d003f3ff86886fefe78a0d720336ff4ee018c

am 447d003f: Merge "Don\'t mark anything as seen if our cursor is empty" into jb-ub-mail-ur9

* commit '447d003f3ff86886fefe78a0d720336ff4ee018c':
  Don't mark anything as seen if our cursor is empty

src/com/android/mail/ui/ConversationListFragment.java

diff --git a/src/com/android/mail/ui/ConversationListFragment.java b/src/com/android/mail/ui/ConversationListFragment.java
index d91a95b..bf3834e 100644
--- a/src/com/android/mail/ui/ConversationListFragment.java
+++ b/src/com/android/mail/ui/ConversationListFragment.java
@@ -791,7 +791,7 @@
         }
         mConversationCursorHash = newCursorHash;
 
-        if (newCursor != null) {
+        if (newCursor != null && newCursor.getCount() > 0) {
             newCursor.markContentsSeen();
         }