From 606e6837e61c4765637b9c35201221a2aa33d270 Mon Sep 17 00:00:00 2001
From: Alex Johnston <acjohnston@google.com>
Date: Mon, 25 Nov 2019 16:39:05 +0000
Subject: [PATCH] Replace setAutoTimeRequired and getAutoTimeRequired with
 setAutoTime and getAutoTime

* Deprecate setAutoTimeRequired and getAutoTimeRequired.
* Added new API methods setAutoTime and getAutoTime.
* These new APIS use the DISALLOW_CONFIG_DATE_TIME user restriction to prevent the user from setting auto time.
* Updated Settings AutoTimePreferenceController to look at the DISALLOW_CONFIG_DATE_TIME restriction

Bug: 138709470
Test: Manual testing with testdpc and the set auto time toggle
      DevicePolicyManagerTest
      DeviceAndProfileOwnerTest
      DevicePolicyLoggingTest
      AutoTimePreferenceControllerTest

Change-Id: I55b44840089a0b701ca4d5572a0e91deb40152ed
---
 .../settings/datetime/AutoTimePreferenceController.java     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/datetime/AutoTimePreferenceController.java b/src/com/android/settings/datetime/AutoTimePreferenceController.java
index bf6ecb418eb..52c5c68e51f 100644
--- a/src/com/android/settings/datetime/AutoTimePreferenceController.java
+++ b/src/com/android/settings/datetime/AutoTimePreferenceController.java
@@ -17,6 +17,8 @@
 package com.android.settings.datetime;
 
 import android.content.Context;
+import android.os.UserHandle;
+import android.os.UserManager;
 import android.provider.Settings;
 
 import androidx.preference.Preference;
@@ -75,6 +77,8 @@ public class AutoTimePreferenceController extends AbstractPreferenceController
     }
 
     private RestrictedLockUtils.EnforcedAdmin getEnforcedAdminProperty() {
-        return RestrictedLockUtilsInternal.checkIfAutoTimeRequired(mContext);
+        return RestrictedLockUtilsInternal.checkIfRestrictionEnforced(
+                mContext, UserManager.DISALLOW_CONFIG_DATE_TIME,
+                UserHandle.myUserId());
     }
 }