1 files changed, 7 insertions, 6 deletions
diff --git a/src/com/android/providers/calendar/CalendarAlarmManager.java b/src/com/android/providers/calendar/CalendarAlarmManager.java
index b107bf7..c77b654 100644
--- a/src/com/android/providers/calendar/CalendarAlarmManager.java
+++ b/src/com/android/providers/calendar/CalendarAlarmManager.java
@@ -30,7 +30,6 @@ import android.database.sqlite.SQLiteDatabase;
 import android.net.Uri;
 import android.os.Build;
 import android.os.PowerManager;
-import android.os.PowerManager.WakeLock;
 import android.os.SystemClock;
 import android.provider.CalendarContract;
 import android.provider.CalendarContract.CalendarAlerts;
@@ -146,9 +145,10 @@ public class CalendarAlarmManager {
         mAlarmLock = new Object();
     }
 
-    private Intent getCheckNextAlarmIntent(boolean removeAlarms) {
+    @VisibleForTesting
+    static Intent getCheckNextAlarmIntent(Context context, boolean removeAlarms) {
         Intent intent = new Intent(CalendarAlarmManager.ACTION_CHECK_NEXT_ALARM);
-        intent.setClass(mContext, CalendarProviderBroadcastReceiver.class);
+        intent.setClass(context, CalendarProviderBroadcastReceiver.class);
         intent.putExtra(KEY_REMOVE_ALARMS, removeAlarms);
         return intent;
     }
@@ -171,7 +171,7 @@ public class CalendarAlarmManager {
             if (Log.isLoggable(CalendarProvider2.TAG, Log.DEBUG)) {
                 Log.d(CalendarProvider2.TAG, "Scheduling check of next Alarm");
             }
-            Intent intent = getCheckNextAlarmIntent(removeAlarms);
+            Intent intent = getCheckNextAlarmIntent(mContext, removeAlarms);
             PendingIntent pending = PendingIntent.getBroadcast(mContext, 0 /* ignored */, intent,
                     PendingIntent.FLAG_NO_CREATE);
             if (pending != null) {
@@ -197,7 +197,7 @@ public class CalendarAlarmManager {
      * @param triggerTimeMillis Time to run the next alarm check, in milliseconds.
      */
     void scheduleNextAlarmCheck(long triggerTimeMillis) {
-        Intent intent = getCheckNextAlarmIntent(false /* removeAlarms*/);
+        Intent intent = getCheckNextAlarmIntent(mContext, false /* removeAlarms*/);
         PendingIntent pending = PendingIntent.getBroadcast(
                 mContext, 0, intent, PendingIntent.FLAG_NO_CREATE);
         if (pending != null) {
@@ -229,8 +229,9 @@ public class CalendarAlarmManager {
      * @param cp2
      */
     void runScheduleNextAlarm(boolean removeAlarms, CalendarProvider2 cp2) {
-        SQLiteDatabase db = cp2.mDb;
+        SQLiteDatabase db = cp2.getWritableDatabase();
         if (db == null) {
+            Log.wtf(CalendarProvider2.TAG, "Unable to get the database.");
             return;
         }