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

2019-03-06 19:15:23 +00:00
parent fe9b21d6ad d74fb7c93c
commit 5d9e667fdf
1 changed files with 1 additions and 2 deletions
--- a/services/core/java/com/android/server/locksettings/LockSettingsService.java
+++ b/services/core/java/com/android/server/locksettings/LockSettingsService.java
@@ -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);
        }
    }