Use revised OTA API

SystemUpdatePolicy API for freeze period was revised according to API
reviews, update usages in TestDPC here as well.

Bug: 74976911
Test: builds
Change-Id: I086baf5a84835a7c179bb421070cdd55ca0a21a7

Author: Rubin Xu

app/src/main/java/com/afwsamples/testdpc/policy/systemupdatepolicy/SystemUpdatePolicyFragment.java

@@ -21,6 +21,7 @@
 import android.app.Fragment;
 import android.app.TimePickerDialog;
 import android.app.admin.DevicePolicyManager;
+import android.app.admin.FreezePeriod;
 import android.app.admin.SystemUpdatePolicy;
 import android.content.Context;
 import android.os.Build;
@@ -43,6 +44,7 @@
 import com.afwsamples.testdpc.R;
 
 import java.time.LocalDate;
+import java.time.MonthDay;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
@@ -62,18 +64,20 @@ public class SystemUpdatePolicyFragment extends Fragment implements View.OnClick
 
     @RequiresApi(api = Build.VERSION_CODES.O)
     static class Period {
-        LocalDate mStart;
-        LocalDate mEnd;
+        MonthDay mStart;
+        MonthDay mEnd;
 
-        public Period(Integer start, Integer end) {
-            int currentYear = LocalDate.now().getYear();
-            mStart = LocalDate.ofYearDay(2001, start).withYear(currentYear);
-            mEnd = LocalDate.ofYearDay(2001, end).withYear(end >= start ? currentYear : currentYear + 1);
+        public Period() {
         }
 
-        public Period(LocalDate startDate, LocalDate endDate) {
-            mStart = startDate;
-            mEnd = endDate;
+        public Period(MonthDay start, MonthDay end) {
+            mStart = start;
+            mEnd = end;
+        }
+
+        public void set(LocalDate startDate, LocalDate endDate) {
+            mStart = MonthDay.of(startDate.getMonth(), startDate.getDayOfMonth());
+            mEnd = MonthDay.of(endDate.getMonth(), endDate.getDayOfMonth());
         }
 
         @Override
@@ -82,9 +86,17 @@ public String toString() {
             return mStart.format(formatter) + " - " + mEnd.format(formatter);
         }
 
-        public Pair<Integer, Integer> toIntegers() {
-            return new Pair<>(mStart.withYear(2001).getDayOfYear(),
-                    mEnd.withYear(2001).getDayOfYear());
+        public LocalDate getStartDate() {
+            return mStart.atYear(LocalDate.now().getYear());
+        }
+
+        public LocalDate getEndDate() {
+            return mEnd.atYear(LocalDate.now().getYear());
+        }
+
+        @TargetApi(28)
+        public FreezePeriod toFreezePeriod() {
+            return new FreezePeriod(mStart, mEnd);
         }
     }
 
@@ -131,10 +143,9 @@ public View getView(int position, View convertView, ViewGroup parent) {
             textView.setOnClickListener(view -> {
                 final Period period = (Period) view.getTag();
                 promptToSetFreezePeriod((LocalDate startDate, LocalDate endDate) -> {
-                    period.mStart = startDate;
-                    period.mEnd = endDate;
+                    period.set(startDate, endDate);
                     mFreezePeriodAdapter.notifyDataSetChanged();
-                }, period.mStart, period.mEnd);
+                }, period.getStartDate(), period.getEndDate());
             });
             View deleteButton = convertView.findViewById(R.id.delete_period);
             deleteButton.setTag(mData.get(position));
@@ -210,7 +221,8 @@ public void onClick(View v) {
                 break;
             case R.id.system_update_policy_btn_add_period:
                 promptToSetFreezePeriod((LocalDate startDate, LocalDate endDate) -> {
-                    Period period = new Period(startDate, endDate);
+                    Period period = new Period();
+                    period.set(startDate, endDate);
                     mFreezePeriods.add(period);
                     mFreezePeriodAdapter.notifyDataSetChanged();
                 }, LocalDate.now(), LocalDate.now());
@@ -270,9 +282,9 @@ private boolean setSystemUpdatePolicy() {
                 newPolicy = null;
         }
         if (BuildCompat.isAtLeastP() && newPolicy != null && mFreezePeriods.size() != 0) {
-            List<Pair<Integer, Integer>> periods = new ArrayList<>(mFreezePeriods.size());
+            List<FreezePeriod> periods = new ArrayList<>(mFreezePeriods.size());
             for (Period p : mFreezePeriods) {
-                periods.add(p.toIntegers());
+                periods.add(p.toFreezePeriod());
             }
             try {
                 newPolicy.setFreezePeriods(periods);
@@ -332,10 +344,10 @@ private void reloadSystemUpdatePolicy() {
                     break;
             }
             if (BuildCompat.isAtLeastP()) {
-                List<Pair<Integer, Integer>> freezePeriods = policy.getFreezePeriods();
+                List<FreezePeriod> freezePeriods = policy.getFreezePeriods();
                 mFreezePeriods.clear();
-                for (Pair<Integer, Integer> period : freezePeriods) {
-                    Period p = new Period(period.first, period.second);
+                for (FreezePeriod period : freezePeriods) {
+                    Period p = new Period(period.getStart(), period.getEnd());
                     mFreezePeriods.add(p);
                 }
                 mFreezePeriodAdapter.notifyDataSetChanged();