Merge "On OTA, MainUser is given to an Admin user"

2022-11-16 00:47:50 +00:00
parent 5358d473cb 62a837a73e
commit 8c8b53dbea
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/pm/UserManagerService.java
+++ b/services/core/java/com/android/server/pm/UserManagerService.java
@@ -3799,7 +3799,7 @@ public class UserManagerService extends IUserManager.Stub {
        long earliestCreationTime = earliestUser.creationTime;
        for (int i = 0; i < users.size(); i++) {
            final UserInfo info = users.get(i);
-            if (info.isFull() && info.creationTime > 0
+            if (info.isFull() && info.isAdmin() && info.creationTime > 0
                    && info.creationTime < earliestCreationTime) {
                earliestCreationTime = info.creationTime;
                earliestUser = info;