commit 864156f921fc1d49517cfc3e04a6a7b7a7c4eab2
author Sara Ting <sarating@google.com> Fri Sep 28 00:33:47 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 28 00:33:47 2012 -0700
tree 2a1607c1ff3a8748ae5c4a1419a868153e322d6d
parent 01ee1808cbacfec804f4058a3e6538203659fb6d
parent b5570054791d2ae2743ab952a7f0e1d0ccf4d0ad

am b5570054: Merge "Fix possible NPE in runScheduleNextAlarm." into jb-mr1-dev

* commit 'b5570054791d2ae2743ab952a7f0e1d0ccf4d0ad':
  Fix possible NPE in runScheduleNextAlarm.

src/com/android/providers/calendar/CalendarAlarmManager.java

diff --git a/src/com/android/providers/calendar/CalendarAlarmManager.java b/src/com/android/providers/calendar/CalendarAlarmManager.java
index d917020..f25d3de 100644
--- a/src/com/android/providers/calendar/CalendarAlarmManager.java
+++ b/src/com/android/providers/calendar/CalendarAlarmManager.java
@@ -193,9 +193,13 @@
      * @param db TODO
      */
     void runScheduleNextAlarm(boolean removeAlarms, CalendarProvider2 cp2) {
+        SQLiteDatabase db = cp2.mDb;
+        if (db == null) {
+            return;
+        }
+
         // Reset so that we can accept other schedules of next alarm
         mNextAlarmCheckScheduled.set(false);
-        SQLiteDatabase db = cp2.mDb;
         db.beginTransaction();
         try {
             if (removeAlarms) {