summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Matt Pape <mpape@google.com> 2019-07-10 09:09:24 -0700
committer android-build-merger <android-build-merger@google.com> 2019-07-10 09:09:24 -0700
commitfa0a1bd282f4d0ef4502b8ea296799fbf1b64f72 (patch)
treee387cb0ae0a0b2630414d3a17d29d24cfdd857d3
parent9760cd265e78c306280f144a8b4d3f0ef23875e1 (diff)
parent54c7c6927c2f0f42e9770cfad19312a26931fe4f (diff)
Merge "Update Mainline rollback lifetime from 2 days to 14 days." into qt-dev
am: 54c7c6927c Change-Id: I24b040f5e4a02abebe929f805fbf4e667b29e92b
-rw-r--r--services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java b/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java
index e107c9aedf38..03c3830c205f 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 @@ 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