Merge "Make sure there is always a user." into udc-dev

2023-03-03 03:33:33 +00:00
parent 5577073fd1 04876d4657
commit 9d1745fbf9
1 changed files with 7 additions and 0 deletions
--- a/services/core/java/com/android/server/pm/UserManagerService.java
+++ b/services/core/java/com/android/server/pm/UserManagerService.java
@@ -3635,6 +3635,13 @@ public class UserManagerService extends IUserManager.Stub {
        } finally {
            IoUtils.closeQuietly(fis);
        }
+
+        synchronized (mUsersLock) {
+            if (mUsers.size() == 0) {
+                Slog.e(LOG_TAG, "mUsers is empty, fallback to single user");
+                fallbackToSingleUserLP();
+            }
+        }
    }

    /**