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

Commit 5d9e667f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Revert "Avoid LockSettingsService NPE during CTS due to races around user removal.""

parents fe9b21d6 d74fb7c9

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

+1 −2
Original line number Diff line number Diff line
@@ -1973,8 +1973,7 @@ public class LockSettingsService extends ILockSettings.Stub { 
        } catch (RemoteException ex) {

            Slog.w(TAG, "unable to clear GK secure user id");

        }

        UserInfo userInfo = mUserManager.getUserInfo(userId);

        if (unknownUser || userInfo == null || userInfo.isManagedProfile()) {

        if (unknownUser || mUserManager.getUserInfo(userId).isManagedProfile()) {

            removeKeystoreProfileKey(userId);

        }

    }