From d74fb7c93c8d240c42e4e69075123de67d190fb8 Mon Sep 17 00:00:00 2001 From: Irina Dumitrescu Date: Wed, 6 Mar 2019 16:42:29 +0000 Subject: Revert "Avoid LockSettingsService NPE during CTS due to races around user removal." This reverts commit e83f51255303da79ea041e95b8da2f55435d02f7. Reason for revert: http://b/125421639 was due to a bug in broadcasts which is now fixed. Change-Id: I678d7721c948dadfbca8aca50183290438e7f451 --- .../core/java/com/android/server/locksettings/LockSettingsService.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/locksettings/LockSettingsService.java b/services/core/java/com/android/server/locksettings/LockSettingsService.java index d83eb08de3f5..aa85c835a5fd 100644 --- a/services/core/java/com/android/server/locksettings/LockSettingsService.java +++ b/services/core/java/com/android/server/locksettings/LockSettingsService.java @@ -1966,8 +1966,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); } } -- cgit v1.2.3-59-g8ed1b