Ignore storage lock events if user does not exist

Storage lock events are relayed whenever CE storage corresponding to a
user is locked. If a user is removed immediately after locking the
storage, the storage events may be processed by LockSettingsService after
the user has been removed. With this change, we add a logic to catch the
IllegalArgumentExceptions sent by UserManager.getUserProperties whenever
it does not recognize the user id (or the user id has been removed), and
ignores the storage lock event in such cases.

Bug: 333615708
Test: atest CtsDevicePolicyTestCases
Ignore-AOSP-First: This change fixes a bug caused by a change that was merged
internally.

Change-Id: I75d7192b42cce62327edadc52af5f47c4e045945

1 files changed, 12 insertions, 7 deletions

diff --git a/services/core/java/com/android/server/locksettings/LockSettingsService.java b/services/core/java/com/android/server/locksettings/LockSettingsService.java
index 19562ef79fbb..dbdb155eb2e3 100644
--- a/services/core/java/com/android/server/locksettings/LockSettingsService.java
+++ b/services/core/java/com/android/server/locksettings/LockSettingsService.java
@@ -950,13 +950,18 @@ public class LockSettingsService extends ILockSettings.Stub {
                             && android.multiuser.Flags.enablePrivateSpaceFeatures()
                             && android.multiuser.Flags.enableBiometricsToUnlockPrivateSpace()) {
                         mHandler.post(() -> {
-                            UserProperties userProperties =
-                                    mUserManager.getUserProperties(UserHandle.of(userId));
-                            if (userProperties != null
-                                    && userProperties.getAllowStoppingUserWithDelayedLocking()) {
-                                int strongAuthRequired = LockPatternUtils.StrongAuthTracker
-                                        .getDefaultFlags(mContext);
-                                requireStrongAuth(strongAuthRequired, userId);
+                            try {
+                                UserProperties userProperties =
+                                        mUserManager.getUserProperties(UserHandle.of(userId));
+                                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);
                             }
                         });
                     }