Merge "More bugreport logging for scheduleconditionprovider." into nyc-dev
diff --git a/core/java/android/service/notification/ZenModeConfig.java b/core/java/android/service/notification/ZenModeConfig.java
index 3e25edb..6911b01 100644
--- a/core/java/android/service/notification/ZenModeConfig.java
+++ b/core/java/android/service/notification/ZenModeConfig.java
@@ -40,6 +40,7 @@
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 @@
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 ====
diff --git a/services/core/java/com/android/server/notification/ScheduleCalendar.java b/services/core/java/com/android/server/notification/ScheduleCalendar.java
index 4c57c1d..9267d82 100644
--- a/services/core/java/com/android/server/notification/ScheduleCalendar.java
+++ b/services/core/java/com/android/server/notification/ScheduleCalendar.java
@@ -31,7 +31,7 @@
@Override
public String toString() {
- return "ScheduleCalendar[mDays=" + mDays + "]";
+ return "ScheduleCalendar[mDays=" + mDays + ", mSchedule=" + mSchedule + "]";
}
public void setSchedule(ScheduleInfo schedule) {
diff --git a/services/core/java/com/android/server/notification/ScheduleConditionProvider.java b/services/core/java/com/android/server/notification/ScheduleConditionProvider.java
index 8d0ad96..15a63ec 100644
--- a/services/core/java/com/android/server/notification/ScheduleConditionProvider.java
+++ b/services/core/java/com/android/server/notification/ScheduleConditionProvider.java
@@ -86,6 +86,8 @@
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);
}