Merge "Do not remove the k_k until all users are unlocked" (4d20410b) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/locksettings/RebootEscrowManager.java

+4 −3

Original line number	Diff line number	Diff line
		@@ -224,6 +224,10 @@ class RebootEscrowManager {
		for (UserInfo user : rebootEscrowUsers) {
		allUsersUnlocked &= restoreRebootEscrowForUser(user.id, escrowKey, kk);
		}

		// Clear the old key in keystore. A new key will be generated by new RoR requests.
		mKeyStoreManager.clearKeyStoreEncryptionKey();

		onEscrowRestoreComplete(allUsersUnlocked);
		}

		@@ -273,9 +277,6 @@ class RebootEscrowManager {
		} catch (IOException e) {
		Slog.w(TAG, "Could not load reboot escrow data for user " + userId, e);
		return false;
		} finally {
		// Clear the old key in keystore. A new key will be generated by new RoR requests.
		mKeyStoreManager.clearKeyStoreEncryptionKey();
		}
		}