Merge "Catch exceptions reading calendar events" into pi-dev

am: c5fb960b01 Change-Id: Iea9f7ea6add748b8ac89994f56ed80e6dd5c8826
2018-04-12 14:10:08 -07:00
parent aec46379d1 c5fb960b01
commit e4c1bc47e6
1 changed files with 3 additions and 0 deletions
--- a/services/core/java/com/android/server/notification/CalendarTracker.java
+++ b/services/core/java/com/android/server/notification/CalendarTracker.java
@@ -30,6 +30,7 @@ import android.provider.CalendarContract.Instances;
 import android.service.notification.ZenModeConfig.EventInfo;
 import android.util.ArraySet;
 import android.util.Log;
+import android.util.Slog;

 import java.io.PrintWriter;
 import java.util.Date;
@@ -161,6 +162,8 @@ public class CalendarTracker {
                    }
                }
            }
+        } catch (Exception e) {
+            Slog.w(TAG, "error reading calendar", e);
        } finally {
            if (cursor != null) {
                cursor.close();