diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-08-05 14:47:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-08-05 14:47:54 +0000 |
| commit | 72b91212640d139c83f886431ad01db77a4dd3ab (patch) | |
| tree | fd4cc9dac6dd7a4646cb909bd1a05f4d47f49a95 | |
| parent | 69cfbfd3e4fe5768699cff19c7e0f8bff80a445e (diff) | |
| parent | 142868be9d3d0a25fe13784135f1bdb7ef2e7d30 (diff) | |
| download | base-android12L-gsi.tar.gz | |
Merge "Fixes UMS.getPreCreatedUserLU() to ignore partial pre-created users." into android12L-gsiandroid12L-gsi
| -rw-r--r-- | services/core/java/com/android/server/pm/UserManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java index 92abc486386a..2e203b030313 100644 --- a/services/core/java/com/android/server/pm/UserManagerService.java +++ b/services/core/java/com/android/server/pm/UserManagerService.java @@ -3995,7 +3995,7 @@ public class UserManagerService extends IUserManager.Stub { for (int i = 0; i < userSize; i++) { final UserData user = mUsers.valueAt(i); if (DBG) Slog.d(LOG_TAG, i + ":" + user.info.toFullString()); - if (user.info.preCreated && user.info.userType.equals(userType)) { + if (user.info.preCreated && !user.info.partial && user.info.userType.equals(userType)) { if (!user.info.isInitialized()) { Slog.w(LOG_TAG, "found pre-created user of type " + userType + ", but it's not initialized yet: " + user.info.toFullString()); |