From 0b76af4d8255b34ae746f93a27705f48e7473b16 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Mon, 27 Feb 2023 19:20:41 +0000 Subject: [PATCH] locksettings: only log FRP migration when actually done Instead of logging "Migrated migrated_frp" when the FRP credential migration is considered, which effectively means whenever the device boots up for the first time (regardless of whether the migration actually needed to be done or not), let's only log if the FRP credential migration is actually being done. Also make the message clearer. Bug: 268526331 Change-Id: I8a46c90902da982eb684e49fb4afee19387621c3 --- .../com/android/server/locksettings/LockSettingsService.java | 1 - .../android/server/locksettings/SyntheticPasswordManager.java | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/locksettings/LockSettingsService.java b/services/core/java/com/android/server/locksettings/LockSettingsService.java index 13a10b6363a3e..e8744e6684d0c 100644 --- a/services/core/java/com/android/server/locksettings/LockSettingsService.java +++ b/services/core/java/com/android/server/locksettings/LockSettingsService.java @@ -887,7 +887,6 @@ public class LockSettingsService extends ILockSettings.Stub { && !getBoolean("migrated_frp", false, 0)) { migrateFrpCredential(); setBoolean("migrated_frp", true, 0); - Slog.i(TAG, "Migrated migrated_frp."); } } diff --git a/services/core/java/com/android/server/locksettings/SyntheticPasswordManager.java b/services/core/java/com/android/server/locksettings/SyntheticPasswordManager.java index 68b85f89a6976..1ec9689a818e0 100644 --- a/services/core/java/com/android/server/locksettings/SyntheticPasswordManager.java +++ b/services/core/java/com/android/server/locksettings/SyntheticPasswordManager.java @@ -960,6 +960,7 @@ class SyntheticPasswordManager { && LockPatternUtils.userOwnsFrpCredential(mContext, userInfo) && getCredentialType(protectorId, userInfo.id) != LockPatternUtils.CREDENTIAL_TYPE_NONE) { + Slog.i(TAG, "Migrating FRP credential to persistent data block"); PasswordData pwd = PasswordData.fromBytes(loadState(PASSWORD_DATA_NAME, protectorId, userInfo.id)); int weaverSlot = loadWeaverSlot(protectorId, userInfo.id);