Merge "Fix a typo for the server blob timeout" am: 5c9ebe31ab am: afb76f685c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I80a7951db38ddcf0c8a7d73cbd6eec9887f00505
This commit is contained in:
Tianjie Xu
2021-02-26 02:00:16 +00:00
committed by Automerger Merge Worker

View File

@@ -44,7 +44,7 @@ class RebootEscrowProviderServerBasedImpl implements RebootEscrowProviderInterfa
* Use the default lifetime of 10 minutes. The lifetime covers the following activities: * Use the default lifetime of 10 minutes. The lifetime covers the following activities:
* Server wrap secret -> device reboot -> server unwrap blob. * 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; private final LockSettingsStorage mStorage;