commit 54c7c6927c2f0f42e9770cfad19312a26931fe4f
author Matt Pape <mpape@google.com> Wed Jul 10 15:50:56 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 10 15:50:56 2019 +0000
tree 84863b5a5d6b2c06c20806a2bb5c9acaf38c0477
parent 71682ae9c7e40e8c80b8346b94471f0b8dbba0a0
parent 6686f1f916f65d167fca3b69e2af0eeefbd58826

Merge "Update Mainline rollback lifetime from 2 days to 14 days." into qt-dev

services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java

diff --git a/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java b/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java
index e107c9a..03c3830 100644
--- a/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java
+++ b/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java
@@ -86,9 +86,9 @@
 
     private static final String TAG = "RollbackManager";
 
-    // Rollbacks expire after 48 hours.
+    // Rollbacks expire after 14 days.
     private static final long DEFAULT_ROLLBACK_LIFETIME_DURATION_MILLIS =
-            TimeUnit.HOURS.toMillis(48);
+            TimeUnit.DAYS.toMillis(14);
 
     // Lock used to synchronize accesses to in-memory rollback data
     // structures. By convention, methods with the suffix "Locked" require