From d983b4cd847fe18c8f995ce85bd870f62f347461 Mon Sep 17 00:00:00 2001
From: Michael Chan <mchan@android.com>
Date: Mon, 13 Dec 2010 18:25:08 -0800
Subject: [PATCH] b/3279789 Fixed NPE in
 CalendarUtils$TimeZoneUtils$AsyncTZHandler.onQueryComplete

Null cursor was returned from query

Change-Id: I68d3852756b159a63c9d4c9aa889ac6edaa16015
---
 core/java/android/util/CalendarUtils.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/core/java/android/util/CalendarUtils.java b/core/java/android/util/CalendarUtils.java
index 1b2a8943ca1d4..b2b48972c5086 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);