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

am: 54c7c6927c Change-Id: I24b040f5e4a02abebe929f805fbf4e667b29e92b
2019-07-10 09:09:24 -07:00
parent 9760cd265e 54c7c6927c
commit fa0a1bd282
1 changed files with 2 additions and 2 deletions
--- a/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java
+++ b/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java
@@ -86,9 +86,9 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub {

    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