Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b76af4d authored by Eric Biggers's avatar Eric Biggers
Browse files

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
parent cacb0f37

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

+0 −1
Original line number Diff line number Diff line
@@ -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.");

        }

    }

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

+1 −0
Original line number Diff line number Diff line
@@ -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);