diff options
| author | Erik <roboerik@android.com> | 2010-09-15 15:51:53 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-09-15 15:51:53 -0700 |
| commit | a8cc20e5fb3d3f34dc2ab1c3f31d348b19afa87b (patch) | |
| tree | 58939083c7661bf174de38d4402e7c96054b00b6 /core/java/android | |
| parent | 344d96635ec40e0c541f32064f42c8ad38e4505a (diff) | |
| parent | 09bd4bf85e357fc8eaa5c6a219a8827159e865da (diff) | |
Merge "b/3004029 Fixed content resolver loss" into gingerbread
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/util/CalendarUtils.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/util/CalendarUtils.java b/core/java/android/util/CalendarUtils.java index 56421da7a7eb..3d340d99d1d6 100644 --- 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) { |