Merge "Ignore storage lock events if user does not exist" into main (fe8be976) · Commits · e / os / android_frameworks_base

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

+12 −7

Original line number	Diff line number	Diff line
		@@ -950,14 +950,19 @@ public class LockSettingsService extends ILockSettings.Stub {
		&& android.multiuser.Flags.enablePrivateSpaceFeatures()
		&& android.multiuser.Flags.enableBiometricsToUnlockPrivateSpace()) {
		mHandler.post(() -> {
		try {
		UserProperties userProperties =
		mUserManager.getUserProperties(UserHandle.of(userId));
		if (userProperties != null
		&& userProperties.getAllowStoppingUserWithDelayedLocking()) {
		if (userProperties != null && userProperties
		.getAllowStoppingUserWithDelayedLocking()) {
		int strongAuthRequired = LockPatternUtils.StrongAuthTracker
		.getDefaultFlags(mContext);
		requireStrongAuth(strongAuthRequired, userId);
		}
		} catch (IllegalArgumentException e) {
		Slogf.d(TAG, "User %d does not exist or has been removed",
		userId);
		}
		});
		}
		}};