Merge "Rename auto time APIs in TestDPC" into ub-testdpc-rvc

Author: TreeHugger Robot

app/src/main/java/com/afwsamples/testdpc/policy/PolicyManagementFragment.java

@@ -2612,23 +2612,23 @@ private void reloadSetAutoTimeRequiredUi() {
     private void reloadSetAutoTimeUi() {
         try {
             boolean isAutoTime = (Boolean) ReflectionUtil.invoke(mDevicePolicyManager,
-                    "getAutoTime", new Class<?>[]{ComponentName.class},
+                    "getAutoTimeEnabled", new Class<?>[]{ComponentName.class},
                     mAdminComponentName);
             mSetAutoTimePreference.setChecked(isAutoTime);
         } catch (ReflectionIsTemporaryException e) {
-            Log.e(TAG, "Error invoking getAutoTime", e);
+            Log.e(TAG, "Error invoking getAutoTimeEnabled", e);
         }
     }
 
     @TargetApi(Util.R_VERSION_CODE)
     private void reloadSetAutoTimeZoneUi() {
         try {
             boolean isAutoTimeZone = (Boolean) ReflectionUtil.invoke(mDevicePolicyManager,
-                    "getAutoTimeZone", new Class<?>[]{ComponentName.class},
+                    "getAutoTimeZoneEnabled", new Class<?>[]{ComponentName.class},
                     mAdminComponentName);
             mSetAutoTimeZonePreference.setChecked(isAutoTimeZone);
         } catch (ReflectionIsTemporaryException e) {
-            Log.e(TAG, "Error invoking getAutoTimeZone", e);
+            Log.e(TAG, "Error invoking getAutoTimeZoneEnabled", e);
         }
     }
 
@@ -4072,11 +4072,11 @@ abstract static class ManageLockTaskListCallback {
 
     private void setAutoTimeEnabled(boolean enabled) {
         try {
-            ReflectionUtil.invoke(mDevicePolicyManager, "setAutoTime",
+            ReflectionUtil.invoke(mDevicePolicyManager, "setAutoTimeEnabled",
                 new Class<?>[]{ComponentName.class, boolean.class},
                 mAdminComponentName, enabled);
         } catch (ReflectionIsTemporaryException e) {
-            Log.e(TAG, "Error invoking setAutoTime", e);
+            Log.e(TAG, "Error invoking setAutoTimeEnabled", e);
             // Prior to R, auto time is controlled by a global setting
             mDevicePolicyManager.setGlobalSetting(mAdminComponentName,
                 Settings.Global.AUTO_TIME, enabled ? "1" : "0");
@@ -4085,11 +4085,11 @@ private void setAutoTimeEnabled(boolean enabled) {
 
     private void setAutoTimeZoneEnabled(boolean enabled) {
         try {
-            ReflectionUtil.invoke(mDevicePolicyManager, "setAutoTimeZone",
+            ReflectionUtil.invoke(mDevicePolicyManager, "setAutoTimeZoneEnabled",
                 new Class<?>[]{ComponentName.class, boolean.class},
                 mAdminComponentName, enabled);
         } catch (ReflectionIsTemporaryException e) {
-            Log.e(TAG, "Error invoking setAutoTimeZone", e);
+            Log.e(TAG, "Error invoking setAutoTimeZoneEnabled", e);
             // Prior to R, auto timezone is controlled by a global setting
             mDevicePolicyManager.setGlobalSetting(mAdminComponentName,
                 Settings.Global.AUTO_TIME_ZONE, enabled ? "1" : "0");