commit be6d3524b64f9149cf9c9ab9198f6a18c045c68d
author Beverly <beverlyt@google.com> Mon Nov 20 11:01:59 2017 -0500
committer Beverly <beverlyt@google.com> Tue Dec 05 14:43:46 2017 -0500
tree b607cedb882e5591ca006a6996f3985a15e69764
parent d52efa56adaca0bc70fb72082c7c663adcb669cc

Public access to static methods in ZenModeConfig

Edits to ScheduleCalendar and ScheduleConditionProvider tests

Test: runtest -x frameworks/base/services/tests/notification/src/com/android/server/notification/ScheduleCalendarTest.java
runtest -x frameworks/base/services/tests/notification/src/com/android/server/notification/ScheduleConditionProviderTest.java$
Bug: 63077372
Change-Id: I0662c230f1f2df867f9b64d69aab3bcb88696b61

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

diff --git a/services/core/java/com/android/server/notification/ScheduleConditionProvider.java b/services/core/java/com/android/server/notification/ScheduleConditionProvider.java
index c5f80bb..ba7fe78 100644
--- a/services/core/java/com/android/server/notification/ScheduleConditionProvider.java
+++ b/services/core/java/com/android/server/notification/ScheduleConditionProvider.java
@@ -29,8 +29,8 @@
 import android.provider.Settings;
 import android.service.notification.Condition;
 import android.service.notification.IConditionProvider;
+import android.service.notification.ScheduleCalendar;
 import android.service.notification.ZenModeConfig;
-import android.service.notification.ZenModeConfig.ScheduleInfo;
 import android.text.TextUtils;
 import android.util.ArrayMap;
 import android.util.ArraySet;
@@ -45,7 +45,6 @@
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
-import java.util.TimeZone;
 
 /**
  * Built-in zen condition provider for daily scheduled time-based conditions.
@@ -134,7 +133,7 @@
             return;
         }
         synchronized (mSubscriptions) {
-            mSubscriptions.put(conditionId, toScheduleCalendar(conditionId));
+            mSubscriptions.put(conditionId, ZenModeConfig.toScheduleCalendar(conditionId));
         }
         evaluateSubscriptions();
     }
@@ -243,15 +242,6 @@
         return cal != null && cal.isInSchedule(time);
     }
 
-    private static ScheduleCalendar toScheduleCalendar(Uri conditionId) {
-        final ScheduleInfo schedule = ZenModeConfig.tryParseScheduleConditionId(conditionId);
-        if (schedule == null || schedule.days == null || schedule.days.length == 0) return null;
-        final ScheduleCalendar sc = new ScheduleCalendar();
-        sc.setSchedule(schedule);
-        sc.setTimeZone(TimeZone.getDefault());
-        return sc;
-    }
-
     private void setRegistered(boolean registered) {
         if (mRegistered == registered) return;
         if (DEBUG) Slog.d(TAG, "setRegistered " + registered);