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

Commit 75ec9ede authored by Tianjie Xu's avatar Tianjie Xu Committed by Automerger Merge Worker
Browse files

Merge "Fix a typo for the server blob timeout" am: 5c9ebe31 am: afb76f68 am: 1ff02233 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607353

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic4dba6c64bf9107600bbe6a8935357b2791431bb
parents 86591e9b 1ff02233

services/core/java/com/android/server/locksettings/RebootEscrowProviderServerBasedImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ class RebootEscrowProviderServerBasedImpl implements RebootEscrowProviderInterfa 
     * Use the default lifetime of 10 minutes. The lifetime covers the following activities:

     * Server wrap secret -> device reboot -> server unwrap blob.

     */

    private static final long DEFAULT_SERVER_BLOB_LIFETIME_IN_MILLIS = 600_1000;

    private static final long DEFAULT_SERVER_BLOB_LIFETIME_IN_MILLIS = 600_000;



    private final LockSettingsStorage mStorage;