Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04e1faf0 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 23669 into eclair 

* changes:
  Cleaner way to fix the -1 count problem (and removing an Eclipse warning along the way).
parents 682e30a8 a010ef4d

core/java/android/provider/Gmail.java

+5 −4
Original line number Diff line number Diff line
@@ -1548,11 +1548,12 @@ public final class Gmail { 
                    getLabelIdValues(labelId).getAsInteger(LabelColumns.NUM_UNREAD_CONVERSATIONS);

            // There seems to be a race condition here that can get the label maps into a bad

            // state and lose state on a particular label.

            if (unreadConversations == null) {

                return 0;

            } else {

                return unreadConversations < 0 ? 0 : unreadConversations;

            int result = 0;

            if (unreadConversations != null) {

                result = unreadConversations < 0 ? 0 : unreadConversations;

            }



            return result;

        }



        /**