diff options
| author | Erik <roboerik@android.com> | 2010-09-15 19:10:10 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-15 19:10:10 -0700 |
| commit | ffc9bf68d6f33a0ea2dc9d3df11618cd122ec7c9 (patch) | |
| tree | 5fa22315af31fce8f10a4afacae7c51394982767 /core/java | |
| parent | d0f81ea95c9c323518b6126ddb87de43d5bab962 (diff) | |
| parent | bfbab8ca36ed62a71118b355f2b8d8985bdb9d38 (diff) | |
am bfbab8ca: am a8cc20e5: Merge "b/3004029 Fixed content resolver loss" into gingerbread
Merge commit 'bfbab8ca36ed62a71118b355f2b8d8985bdb9d38'
* commit 'bfbab8ca36ed62a71118b355f2b8d8985bdb9d38':
b/3004029 Fixed content resolver loss
Diffstat (limited to 'core/java')
| -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) { |