diff options
| author | Michael Chan <mchan@android.com> | 2010-12-13 18:25:08 -0800 |
|---|---|---|
| committer | Michael Chan <mchan@android.com> | 2011-01-09 12:11:02 -0800 |
| commit | aa5bb98120fb7c9f83e7ea7f72ba7e123edc3bf1 (patch) | |
| tree | 4d8916a1b6b09141d5946795b2c722fd1977aba9 /core/java/android/util | |
| parent | fd6f39e147dc077139a41b9c2a4039fbaa20224e (diff) | |
| download | frameworks_base-aa5bb98120fb7c9f83e7ea7f72ba7e123edc3bf1.zip frameworks_base-aa5bb98120fb7c9f83e7ea7f72ba7e123edc3bf1.tar.gz frameworks_base-aa5bb98120fb7c9f83e7ea7f72ba7e123edc3bf1.tar.bz2 | |
b/3279789 Fixed NPE in CalendarUtils$TimeZoneUtils$AsyncTZHandler.onQueryComplete
Null cursor was returned from query
Change-Id: I76a7d710b0764f52ed6ced23792717feb7b6ae08
Diffstat (limited to 'core/java/android/util')
| -rw-r--r-- | core/java/android/util/CalendarUtils.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/core/java/android/util/CalendarUtils.java b/core/java/android/util/CalendarUtils.java index 1b2a894..b2b4897 100644 --- a/core/java/android/util/CalendarUtils.java +++ b/core/java/android/util/CalendarUtils.java @@ -88,6 +88,12 @@ public class CalendarUtils { @Override protected void onQueryComplete(int token, Object cookie, Cursor cursor) { synchronized (mTZCallbacks) { + if (cursor == null) { + mTZQueryInProgress = false; + mFirstTZRequest = true; + return; + } + boolean writePrefs = false; // Check the values in the db int keyColumn = cursor.getColumnIndexOrThrow(CalendarCache.KEY); |