From 04876d4657687fa8bf8043066ac9327c69e78393 Mon Sep 17 00:00:00 2001 From: Alex Buynytskyy Date: Wed, 1 Mar 2023 19:07:06 -0800 Subject: [PATCH] Make sure there is always a user. Bug: 269072872 Test: atest com.android.server.pm.UserManagerTest Change-Id: Ic6c523ede4538cc8152214812f840c146659a7cf --- .../java/com/android/server/pm/UserManagerService.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java index b21243a7baecc..2f98d3485d906 100644 --- 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(); + } + } } /**