Merge "b/3004029 Fixed content resolver loss" into gingerbread

2010-09-15 15:51:53 -07:00
parent 344d96635e 09bd4bf85e
commit a8cc20e5fb
1 changed files with 3 additions and 3 deletions
--- a/core/java/android/util/CalendarUtils.java
+++ b/core/java/android/util/CalendarUtils.java
@@ -206,11 +206,11 @@ public class CalendarUtils {

                // Update the db
                ContentValues values = new ContentValues();
-                if (mHandler == null) {
-                    mHandler = new AsyncTZHandler(context.getContentResolver());
+                if (mHandler != null) {
+                    mHandler.cancelOperation(mToken);
                }

-                mHandler.cancelOperation(mToken);
+                mHandler = new AsyncTZHandler(context.getContentResolver());

                // skip 0 so query can use it
                if (++mToken == 0) {