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

Commit bfc7faaf authored by Rubin Xu's avatar Rubin Xu
Browse files

Fix boot loop when upgrading direclty from L to N 

A second attempt to fix the upgrade problem due to SID == 0
in the above upgrade path. The previous fix contains a bug
where it would cause future attempts to unify work challenge
to silently fail, and crash SystemUi when unlocking.

This fix adds a check for non-zero SID before doing the initial work
profile unification (which caused the upgrade crash when SID == 0).
This means the initial work profile unification would only happen when
the user has unlocked the lockscreen and SID is generated.

Bug: 32490092
Bug: 33050562
Change-Id: Ib28951b2ec26b4f091df7763d9902f55616fcb5c
parent d427da8a

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

+11 −0
Original line number Diff line number Diff line
@@ -240,6 +240,17 @@ public class LockSettingsService extends ILockSettings.Stub { 
            if (DEBUG) Slog.v(TAG, "Parent does not have a screen lock");

            return;

        }

        // Do not tie when the parent has no SID (but does have a screen lock).

        // This can only happen during an upgrade path where SID is yet to be

        // generated when the user unlocks for the first time.

        try {

            if (getGateKeeperService().getSecureUserId(parentId) == 0) {

                return;

            }

        } catch (RemoteException e) {

            Slog.e(TAG, "Failed to talk to GateKeeper service", e);

            return;

        }

        if (DEBUG) Slog.v(TAG, "Tie managed profile to parent now!");

        byte[] randomLockSeed = new byte[] {};

        try {