From 7f73308f50791740beb380fecc17903301054ad3 Mon Sep 17 00:00:00 2001 From: Julia Reynolds Date: Tue, 26 Apr 2016 14:19:19 -0400 Subject: [PATCH] More bugreport logging for scheduleconditionprovider. Bug: 28261291 Change-Id: I70d1b466a9d4e18e5f4d9b1209711c442434ecab --- .../service/notification/ZenModeConfig.java | 14 ++++++++++++++ .../server/notification/ScheduleCalendar.java | 2 +- .../notification/ScheduleConditionProvider.java | 2 ++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/core/java/android/service/notification/ZenModeConfig.java b/core/java/android/service/notification/ZenModeConfig.java index 3e25edbaba6e9..6911b01617047 100644 --- a/core/java/android/service/notification/ZenModeConfig.java +++ b/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 ==== diff --git a/services/core/java/com/android/server/notification/ScheduleCalendar.java b/services/core/java/com/android/server/notification/ScheduleCalendar.java index 4c57c1dc0e949..9267d8229e169 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 @@ public class ScheduleCalendar { @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 8d0ad96be44e3..15a63ec6875ba 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 @@ 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); }