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

Merge commit 'bfbab8ca36ed62a71118b355f2b8d8985bdb9d38'

* commit 'bfbab8ca36ed62a71118b355f2b8d8985bdb9d38':
  b/3004029 Fixed content resolver loss
This commit is contained in:
Erik
2010-09-15 19:10:10 -07:00
committed by Android Git Automerger

View File

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