Merge "More bugreport logging for scheduleconditionprovider." into nyc-dev

core/java/android/service/notification/ZenModeConfig.java

@@ -40,6 +40,7 @@ import org.xmlpull.v1.XmlSerializer;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 import java.util.Locale;
@@ -878,6 +879,19 @@ public class ZenModeConfig implements Parcelable {
             rt.nextAlarm = nextAlarm;
             return rt;
         }
+
+        @Override
+        public String toString() {
+            return "ScheduleInfo{" +
+                    "days=" + Arrays.toString(days) +
+                    ", startHour=" + startHour +
+                    ", startMinute=" + startMinute +
+                    ", endHour=" + endHour +
+                    ", endMinute=" + endMinute +
+                    ", exitAtAlarm=" + exitAtAlarm +
+                    ", nextAlarm=" + nextAlarm +
+                    '}';
+        }
     }
 
     // ==== Built-in system condition: event ====

services/core/java/com/android/server/notification/ScheduleCalendar.java

@@ -31,7 +31,7 @@ public class ScheduleCalendar {
 
     @Override
     public String toString() {
-        return "ScheduleCalendar[mDays=" + mDays + "]";
+        return "ScheduleCalendar[mDays=" + mDays + ", mSchedule=" + mSchedule + "]";
     }
 
     public void setSchedule(ScheduleInfo schedule) {

services/core/java/com/android/server/notification/ScheduleConditionProvider.java

@@ -86,6 +86,8 @@ public class ScheduleConditionProvider extends SystemConditionProviderService {
             pw.print("        ");
             pw.print(meetsSchedule(mSubscriptions.get(conditionId), now) ? "* " : "  ");
             pw.println(conditionId);
+            pw.print("            ");
+            pw.println(mSubscriptions.get(conditionId).toString());
         }
         dumpUpcomingTime(pw, "mNextAlarmTime", mNextAlarmTime, now);
     }