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

Commit de0d9466 authored by Eric Biggers's avatar Eric Biggers Committed by Automerger Merge Worker
Browse files

locksettings: only log FRP migration when actually done am: 8ff87c63 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21724585



Change-Id: I0075758c90afc1eef537dfa28a5437f15a00b690
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents eb40ca48 8ff87c63

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
@@ -964,6 +964,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);