commit bfbab8ca36ed62a71118b355f2b8d8985bdb9d38
author Erik <roboerik@android.com> Wed Sep 15 15:54:27 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 15 15:54:27 2010 -0700
tree a5f1e92ec175dbefa04393bc6779b328a09aa408
parent 42e72e570b66c3bed316a9e7a766d2f8fc986ae6
parent a8cc20e5fb3d3f34dc2ab1c3f31d348b19afa87b

am a8cc20e5: Merge "b/3004029 Fixed content resolver loss" into gingerbread

Merge commit 'a8cc20e5fb3d3f34dc2ab1c3f31d348b19afa87b' into gingerbread-plus-aosp

* commit 'a8cc20e5fb3d3f34dc2ab1c3f31d348b19afa87b':
  b/3004029 Fixed content resolver loss

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) {