commit 52d046c0e77df862b4cec48012b33df16f17eac3
author Baligh Uddin <baligh@google.com> Tue Sep 10 14:31:20 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 10 14:31:20 2013 +0000
tree 613755dca1e50275f475c81cdab2ab99a385d2ca
parent ec5b82ac3fc8f914fa1efdeff36ea3dc4e55b3e3
parent d4de009d0f5768235cfbac25ac924fb945f23ca3

Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10

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..6c15e88 100644
--- a/src/com/android/mail/browse/ConversationCursor.java
+++ b/src/com/android/mail/browse/ConversationCursor.java
@@ -916,7 +916,7 @@
                 mCacheMap.put(uriString, map);
             }
             // If we're caching a deletion, add to our count
-            if (columnName == DELETED_COLUMN) {
+            if (columnName.equals(DELETED_COLUMN)) {
                 final boolean state = (Boolean)value;
                 final boolean hasValue = map.get(columnName) != null;
                 if (state && !hasValue) {
@@ -944,7 +944,7 @@
             }
             putInValues(map, columnName, value);
             map.put(UPDATE_TIME_COLUMN, System.currentTimeMillis());
-            if (DEBUG && (columnName != DELETED_COLUMN)) {
+            if (DEBUG && (!columnName.equals(DELETED_COLUMN))) {
                 LogUtils.i(LOG_TAG, "Caching value for %s: %s", uriString, columnName);
             }
         }