commit d629c572feb10a466f34d1a5ada567bcb1104ee4
author Zhen Zhang <zzhen@google.com> Thu Jul 06 09:47:07 2023 -0500
committer Zhen Zhang <zzhen@google.com> Thu Jul 20 15:37:28 2023 +0000
tree 3d7664e2eb9343584fa7778706d6fc7a057135e5
parent 9904d760006c5c3c98ed5c173e49f7f83724d692

Use network time when calculate next checkin timestamp

The response from server should be based on network time.

Test: atest DeviceLockControllerRoboTests
Bug: 288937639

Change-Id: Ie181666c32994e139f6b51d8694223499c41b20b
(cherry picked from commit c59b1014485d24c19bebc32bb903ef4d4505bb3d)

DeviceLockController/src/com/android/devicelockcontroller/debug/DeviceCheckInClientDebug.java

diff --git a/DeviceLockController/src/com/android/devicelockcontroller/debug/DeviceCheckInClientDebug.java b/DeviceLockController/src/com/android/devicelockcontroller/debug/DeviceCheckInClientDebug.java
index afb8c9a..d37c8b7 100644
--- a/DeviceLockController/src/com/android/devicelockcontroller/debug/DeviceCheckInClientDebug.java
+++ b/DeviceLockController/src/com/android/devicelockcontroller/debug/DeviceCheckInClientDebug.java
@@ -19,6 +19,7 @@
 import static com.android.devicelockcontroller.common.DeviceLockConstants.DeviceProvisionState.PROVISION_STATE_UNSPECIFIED;
 import static com.android.devicelockcontroller.common.DeviceLockConstants.READY_FOR_PROVISION;
 
+import android.os.SystemClock;
 import android.os.SystemProperties;
 import android.util.ArraySet;
 
@@ -77,7 +78,8 @@
                 Duration delay = Duration.ofMinutes(
                         SystemProperties.getInt(
                                 "debug.devicelock.checkin.retry-delay", /* def= */ 1));
-                return DebugLogUtil.logAndReturn(TAG, Instant.now().plusSeconds(delay.toSeconds()));
+                return DebugLogUtil.logAndReturn(TAG,
+                        SystemClock.currentNetworkTimeClock().instant().plus(delay));
             }
 
             @Nullable