Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Acquire the wake lock to ensure RoR isn't delayed" am: 9dbd3ea3e0 am: c8eebe97e7

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

Change-Id: I72f16350e2d703e20c1c3a4f9b2054ed02700bfa
This commit is contained in:
Tianjie Xu
2021-07-02 01:35:53 +00:00
committed by Automerger Merge Worker
parent 7ad93b5cd2 c8eebe97e7
commit c6cc6d355e
1 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
services/core/java/com/android/server/locksettings/RebootEscrowManager.java
View File

@@ -37,6 +37,7 @@ import android.net.ConnectivityManager;
import android.net.Network; import android.net.Network;
import android.net.NetworkCapabilities; import android.net.NetworkCapabilities;
import android.os.Handler; import android.os.Handler;
import android.os.PowerManager;
import android.os.SystemClock; import android.os.SystemClock;
import android.os.SystemProperties; import android.os.SystemProperties;
import android.os.UserManager; import android.os.UserManager;
@@ -119,6 +120,8 @@ class RebootEscrowManager {
*/ */
private static final int DEFAULT_LOAD_ESCROW_DATA_RETRY_COUNT = 3; private static final int DEFAULT_LOAD_ESCROW_DATA_RETRY_COUNT = 3;
private static final int DEFAULT_LOAD_ESCROW_DATA_RETRY_INTERVAL_SECONDS = 30; private static final int DEFAULT_LOAD_ESCROW_DATA_RETRY_INTERVAL_SECONDS = 30;
// 3 minutes. It's enough for the default 3 retries with 30 seconds interval
private static final int DEFAULT_WAKE_LOCK_TIMEOUT_MILLIS = 180_000;
@IntDef(prefix = {"ERROR_"}, value = { @IntDef(prefix = {"ERROR_"}, value = {
ERROR_NONE, ERROR_NONE,
@@ -187,6 +190,9 @@ class RebootEscrowManager {
private final RebootEscrowKeyStoreManager mKeyStoreManager; private final RebootEscrowKeyStoreManager mKeyStoreManager;
PowerManager.WakeLock mWakeLock;
interface Callbacks { interface Callbacks {
boolean isUserSecure(int userId); boolean isUserSecure(int userId);
@@ -279,6 +285,11 @@ class RebootEscrowManager {
return mRebootEscrowProvider; return mRebootEscrowProvider;
} }
PowerManager.WakeLock getWakeLock() {
final PowerManager pm = mContext.getSystemService(PowerManager.class);
return pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "RebootEscrowManager");
}
public RebootEscrowProviderInterface getRebootEscrowProvider() { public RebootEscrowProviderInterface getRebootEscrowProvider() {
return mRebootEscrowProvider; return mRebootEscrowProvider;
} }
@@ -365,6 +376,13 @@ class RebootEscrowManager {
return; return;
} }
// Acquire the wake lock to make sure our scheduled task will run.
mWakeLock = mInjector.getWakeLock();
if (mWakeLock != null) {
mWakeLock.setReferenceCounted(false);
mWakeLock.acquire(DEFAULT_WAKE_LOCK_TIMEOUT_MILLIS);
}
mInjector.post(retryHandler, () -> loadRebootEscrowDataWithRetry( mInjector.post(retryHandler, () -> loadRebootEscrowDataWithRetry(
retryHandler, 0, users, rebootEscrowUsers)); retryHandler, 0, users, rebootEscrowUsers));
} }
@@ -519,6 +537,10 @@ class RebootEscrowManager {
// Clear the saved reboot escrow provider // Clear the saved reboot escrow provider
mInjector.clearRebootEscrowProvider(); mInjector.clearRebootEscrowProvider();
clearMetricsStorage(); clearMetricsStorage();
if (mWakeLock != null) {
mWakeLock.release();
}
} }
private RebootEscrowKey getAndClearRebootEscrowKey(SecretKey kk) throws IOException { private RebootEscrowKey getAndClearRebootEscrowKey(SecretKey kk) throws IOException {