Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 23669 into eclair

Browse Source 
* changes:
  Cleaner way to fix the -1 count problem (and removing an Eclipse warning along the way).
This commit is contained in:
Android (Google) Code Review
2009-09-02 13:33:43 -07:00
parent 682e30a894 a010ef4d7e
commit 04e1faf0f0
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/provider/Gmail.java
View File

@@ -1548,11 +1548,12 @@ public final class Gmail {
getLabelIdValues(labelId).getAsInteger(LabelColumns.NUM_UNREAD_CONVERSATIONS); getLabelIdValues(labelId).getAsInteger(LabelColumns.NUM_UNREAD_CONVERSATIONS);
// There seems to be a race condition here that can get the label maps into a bad // 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. // state and lose state on a particular label.
if (unreadConversations == null) { int result = 0;
return 0; if (unreadConversations != null) {
} else { result = unreadConversations < 0 ? 0 : unreadConversations;
return unreadConversations < 0 ? 0 : unreadConversations;
} }
return result;
} }
/** /**