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

Merge changes Ia43ab0ab,I0c4b91aa

Browse Source 
* changes:
  Always use the server based provider if HAL isn't installed
  Dump the IOexception before retrying load escrow key
This commit is contained in:
Tianjie Xu
2021-04-29 05:17:55 +00:00
committed by Gerrit Code Review
parent d1473b36d6 adc5a1d764
commit 474d549f7c
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.UserIdInt;
import android.content.Context;
import android.content.pm.PackageManager;
import android.content.pm.UserInfo;
import android.os.Handler;
import android.os.SystemClock;
@@ -224,6 +225,12 @@ class RebootEscrowManager {
}
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,
"server_based_ror_enabled", false);
}
@@ -374,6 +381,7 @@ class RebootEscrowManager {
try {
escrowKey = getAndClearRebootEscrowKey(kk);
} catch (IOException e) {
Slog.i(TAG, "Failed to load escrow key, scheduling retry.", e);
scheduleLoadRebootEscrowDataOrFail(retryHandler, attemptNumber + 1, users,
rebootEscrowUsers);
return;