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

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

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

parents eec4726e e83f5125

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

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

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

        }

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

        UserInfo userInfo = mUserManager.getUserInfo(userId);

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

            removeKeystoreProfileKey(userId);

        }

    }