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

Commit f10ae7e7 authored by Pavel Grafov's avatar Pavel Grafov
Browse files

Restore separate challenge state on error 

Otherwise if something goes wrong when tying the profile to the primary
user, challenge will remain in inconsistent state and the user won't
be able to unlock the profile.

Bug: 110262879
Test: manual, unified both compliant and uncompliant challenge.
Change-Id: I2bea3867541f43cbabd5cabbe8a0f61acc2602ca
parent 0eb2be3a

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

+11 −5
Original line number Diff line number Diff line
@@ -955,13 +955,19 @@ public class LockSettingsService extends ILockSettings.Stub { 
    @GuardedBy("mSeparateChallengeLock")

    private void setSeparateProfileChallengeEnabledLocked(@UserIdInt int userId, boolean enabled,

            String managedUserPassword) {

        final boolean old = getBoolean(SEPARATE_PROFILE_CHALLENGE_KEY, false, userId);

        setBoolean(SEPARATE_PROFILE_CHALLENGE_KEY, enabled, userId);

        try {

            if (enabled) {

                mStorage.removeChildProfileLock(userId);

                removeKeystoreProfileKey(userId);

            } else {

                tieManagedProfileLockIfNecessary(userId, managedUserPassword);

            }

        } catch (IllegalStateException e) {

            setBoolean(SEPARATE_PROFILE_CHALLENGE_KEY, old, userId);

            throw e;

        }

    }



    private void notifySeparateProfileChallengeChanged(int userId) {