Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 579b24ff authored by Matt Pape's avatar Matt Pape Committed by android-build-merger
Browse files

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

Merge "Update Mainline rollback lifetime from 2 days to 14 days." into qt-dev am: 54c7c692 am: fa0a1bd2
am: 5d9374a6

Change-Id: Icc012e5a53bc68017394e4fcb2f55e1e90936152
parents 1a8d1110 5d9374a6

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

+2 −2
Original line number Diff line number Diff line
@@ -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