commit 63bda164540886f006272aa9adc6e13c9b2bc017
author Neil Fuller <nfuller@google.com> Thu Dec 19 06:12:34 2019 -0800
committer android-build-merger <android-build-merger@google.com> Thu Dec 19 06:12:34 2019 -0800
tree ae6d9997afc2feffdd212b6ad90d2cc0a22465ab
parent 4cf64622a9867e1c6a5ecde0fe7211d4e2d41734
parent 9bc4829b4a32945fa04f7f6c90cbecb2ab48dcc8

Revert TimeZoneDetector / TimeDetector changes
am: 9bc4829b4a

Change-Id: Ifbc4bd37e3465c81a7ef8527bf231caee3045aa9

src/com/android/managedprovisioning/task/DeviceOwnerInitializeProvisioningTask.java

diff --git a/src/com/android/managedprovisioning/task/DeviceOwnerInitializeProvisioningTask.java b/src/com/android/managedprovisioning/task/DeviceOwnerInitializeProvisioningTask.java
index 98bc997..d6a3243 100644
--- a/src/com/android/managedprovisioning/task/DeviceOwnerInitializeProvisioningTask.java
+++ b/src/com/android/managedprovisioning/task/DeviceOwnerInitializeProvisioningTask.java
@@ -16,10 +16,7 @@
 
 package com.android.managedprovisioning.task;
 
-import android.app.timedetector.ManualTimeSuggestion;
-import android.app.timedetector.TimeDetector;
-import android.app.timezonedetector.ManualTimeZoneSuggestion;
-import android.app.timezonedetector.TimeZoneDetector;
+import android.app.AlarmManager;
 import android.content.Context;
 
 import com.android.internal.app.LocalePicker;
@@ -54,22 +51,15 @@
 
     private void setTimeAndTimezone(String timeZone, long localTime) {
         try {
+            final AlarmManager alarmManager = mContext.getSystemService(AlarmManager.class);
             if (timeZone != null) {
-                TimeZoneDetector timeZoneDetector =
-                        mContext.getSystemService(TimeZoneDetector.class);
-                ManualTimeZoneSuggestion manualTimeZoneSuggestion =
-                        TimeZoneDetector.createManualTimeZoneSuggestion(
-                                timeZone, "ManagedProvisioning: setTimeAndTimezone");
-                timeZoneDetector.suggestManualTimeZone(manualTimeZoneSuggestion);
+                alarmManager.setTimeZone(timeZone);
             }
             if (localTime > 0) {
-                TimeDetector timeDetector = mContext.getSystemService(TimeDetector.class);
-                ManualTimeSuggestion manualTimeSuggestion = TimeDetector.createManualTimeSuggestion(
-                        localTime, "ManagedProvisioning: setTimeAndTimezone()");
-                timeDetector.suggestManualTime(manualTimeSuggestion);
+                alarmManager.setTime(localTime);
             }
         } catch (Exception e) {
-            ProvisionLogger.loge("Failed to set the system time/timezone.", e);
+            ProvisionLogger.loge("Alarm manager failed to set the system time/timezone.", e);
             // Do not stop provisioning process, but ignore this error.
         }
     }