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

Merge changes Ia43ab0ab,I0c4b91aa am: 474d549f7c am: 38762c75d1

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

Change-Id: I527307961df8d8e8932b704cb63c959b0f6f4ee8
This commit is contained in:
Tianjie Xu
2021-04-29 06:02:44 +00:00
committed by Automerger Merge Worker
parent 97a9cfb605 38762c75d1
commit af1f784ee0
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,6 +31,7 @@ import android.annotation.IntDef;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.UserIdInt; import android.annotation.UserIdInt;
import android.content.Context; import android.content.Context;
import android.content.pm.PackageManager;
import android.content.pm.UserInfo; import android.content.pm.UserInfo;
import android.os.Handler; import android.os.Handler;
import android.os.SystemClock; import android.os.SystemClock;
@@ -224,6 +225,12 @@ class RebootEscrowManager {
} }
public boolean serverBasedResumeOnReboot() { public boolean serverBasedResumeOnReboot() {
// Always use the server based RoR if the HAL isn't installed on device.
if (!mContext.getPackageManager().hasSystemFeature(
PackageManager.FEATURE_REBOOT_ESCROW)) {
return true;
}
return DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_OTA, return DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_OTA,
"server_based_ror_enabled", false); "server_based_ror_enabled", false);
} }
@@ -374,6 +381,7 @@ class RebootEscrowManager {
try { try {
escrowKey = getAndClearRebootEscrowKey(kk); escrowKey = getAndClearRebootEscrowKey(kk);
} catch (IOException e) { } catch (IOException e) {
Slog.i(TAG, "Failed to load escrow key, scheduling retry.", e);
scheduleLoadRebootEscrowDataOrFail(retryHandler, attemptNumber + 1, users, scheduleLoadRebootEscrowDataOrFail(retryHandler, attemptNumber + 1, users,
rebootEscrowUsers); rebootEscrowUsers);
return; return;