Merge "Catch exceptions reading calendar events" into pi-dev am: c5fb960b01

am: e4c1bc47e6 Change-Id: Id922427d386fca83e4c99b78a686b8613718dd37
2018-04-12 14:34:40 -07:00
parent ca0930c09a e4c1bc47e6
commit c07126db79
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();