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

Merge "Resume-on-Reboot: add logs to aid in debugging"

Browse Source
This commit is contained in:
Kenny Root
2020-02-13 01:54:53 +00:00
committed by Android (Google) Code Review
parent d22bc99894 883f89e6a9
commit 6afde9247b
2 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -150,6 +150,7 @@ class RebootEscrowManager {
private RebootEscrowKey getAndClearRebootEscrowKey() {
IRebootEscrow rebootEscrow = mInjector.getRebootEscrow();
if (rebootEscrow == null) {
Slog.w(TAG, "Had reboot escrow data for users, but RebootEscrow HAL is unavailable");
return null;
}
@@ -197,11 +198,12 @@ class RebootEscrowManager {
mCallbacks.onRebootEscrowRestored(escrowData.getSpVersion(),
escrowData.getSyntheticPassword(), userId);
Slog.i(TAG, "Restored reboot escrow data for user " + userId);
return true;
} catch (IOException e) {
Slog.w(TAG, "Could not load reboot escrow data for user " + userId, e);
return false;
}
return false;
}
void callToRebootEscrowIfNeeded(@UserIdInt int userId, byte spVersion,
@@ -212,16 +214,13 @@ class RebootEscrowManager {
IRebootEscrow rebootEscrow = mInjector.getRebootEscrow();
if (rebootEscrow == null) {
mRebootEscrowWanted = false;
setRebootEscrowReady(false);
Slog.w(TAG, "Reboot escrow requested, but RebootEscrow HAL is unavailable");
return;
}
RebootEscrowKey escrowKey = generateEscrowKeyIfNeeded();
if (escrowKey == null) {
Slog.e(TAG, "Could not generate escrow key");
mRebootEscrowWanted = false;
setRebootEscrowReady(false);
return;
}
@@ -250,6 +249,7 @@ class RebootEscrowManager {
try {
key = RebootEscrowKey.generate();
} catch (IOException e) {
Slog.w(TAG, "Could not generate reboot escrow key");
return null;
}
@@ -286,6 +286,7 @@ class RebootEscrowManager {
IRebootEscrow rebootEscrow = mInjector.getRebootEscrow();
if (rebootEscrow == null) {
Slog.w(TAG, "Escrow marked as ready, but RebootEscrow HAL is unavailable");
return false;
}
@@ -295,6 +296,7 @@ class RebootEscrowManager {
}
if (escrowKey == null) {
Slog.e(TAG, "Escrow key is null, but escrow was marked as ready");
return false;
}
@@ -302,8 +304,9 @@ class RebootEscrowManager {
try {
rebootEscrow.storeKey(escrowKey.getKeyBytes());
armedRebootEscrow = true;
Slog.i(TAG, "Reboot escrow key stored with RebootEscrow HAL");
} catch (RemoteException e) {
Slog.w(TAG, "Failed escrow secret to RebootEscrow HAL", e);
Slog.e(TAG, "Failed escrow secret to RebootEscrow HAL", e);
}
return armedRebootEscrow;
}

21
services/core/java/com/android/server/recoverysystem/RecoverySystemService.java
View File

@@ -359,20 +359,23 @@ public class RecoverySystemService extends IRecoverySystem.Stub implements Reboo
mContext.enforceCallingOrSelfPermission(android.Manifest.permission.RECOVERY, null);
if (!mPreparedForReboot) {
Slog.i(TAG, "Reboot requested before prepare completed");
return false;
}
if (updateToken != null && updateToken.equals(mUnattendedRebootToken)) {
if (!mInjector.getLockSettingsService().armRebootEscrow()) {
return false;
}
PowerManager pm = mInjector.getPowerManager();
pm.reboot(reason);
return true;
if (updateToken != null && !updateToken.equals(mUnattendedRebootToken)) {
Slog.i(TAG, "Reboot requested after preparation, but with mismatching token");
return false;
}
return false;
if (!mInjector.getLockSettingsService().armRebootEscrow()) {
Slog.w(TAG, "Failure to escrow key for reboot");
return false;
}
PowerManager pm = mInjector.getPowerManager();
pm.reboot(reason);
return true;
}
/**