commit a8cc20e5fb3d3f34dc2ab1c3f31d348b19afa87b
author Erik <roboerik@android.com> Wed Sep 15 15:51:53 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 15 15:51:53 2010 -0700
tree 58939083c7661bf174de38d4402e7c96054b00b6
parent 344d96635ec40e0c541f32064f42c8ad38e4505a
parent 09bd4bf85e357fc8eaa5c6a219a8827159e865da

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

core/java/android/util/CalendarUtils.java

diff --git a/core/java/android/util/CalendarUtils.java b/core/java/android/util/CalendarUtils.java
index 56421da..3d340d9 100644
--- a/core/java/android/util/CalendarUtils.java
+++ b/core/java/android/util/CalendarUtils.java
@@ -206,11 +206,11 @@
 
                 // 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) {