diff options
| author | 2024-09-05 12:12:26 +0000 | |
|---|---|---|
| committer | 2024-09-05 12:12:26 +0000 | |
| commit | 6b90dbd4faf6be117c6226e46dd47c41c04e1eb0 (patch) | |
| tree | ad898b36c5c87269914b933351570dc548fd1678 | |
| parent | 29baee3237ea80b4754fc5a926c068a5e89335e3 (diff) | |
Revert "Avoid marking ephemeral users for removal if they haven't been logged in"
This reverts commit 29baee3237ea80b4754fc5a926c068a5e89335e3.
Reason for revert: Didn't make any improvements for b/352716720 and caused b/364773103
Bug: 352716720
Change-Id: I5776a3b3a0fe57ac2e753682d804bfb37592fbad
Fixes: 364773103
| -rw-r--r-- | services/core/java/com/android/server/pm/UserManagerService.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java index 13901c1f2c23..a683a8c54849 100644 --- a/services/core/java/com/android/server/pm/UserManagerService.java +++ b/services/core/java/com/android/server/pm/UserManagerService.java @@ -1194,11 +1194,11 @@ public class UserManagerService extends IUserManager.Stub { // Avoid marking pre-created users for removal. return; } - if (ui.lastLoggedInTime == 0) { - // Avoid marking a not-yet-logged-in ephemeral user for removal, since it doesn't have - // any personal data in it yet due to not being logged in. - // This will also avoid marking an auto-created not-yet-logged-in ephemeral guest user - // for removal, which would be recreated again later in the boot anyway. + if (ui.lastLoggedInTime == 0 && ui.isGuest() && Resources.getSystem().getBoolean( + com.android.internal.R.bool.config_guestUserAutoCreated)) { + // Avoid marking auto-created but not-yet-logged-in guest user for removal. Because a + // new one will be created anyway, and this one doesn't have any personal data in it yet + // due to not being logged in. return; } // Mark the user for removal. |