From 62a837a73e3f178c45c6fa8c95a408736698c65e Mon Sep 17 00:00:00 2001 From: Adam Bookatz Date: Tue, 15 Nov 2022 19:17:29 +0000 Subject: [PATCH] On OTA, MainUser is given to an Admin user Followup to Ib36f3b372f9bf33cbb097c4af63eb43515ac835b. For consistency, we give MainUser designation specifically to an Admin user. That way, for now, all MainUsers are indeed Admin users. We may not make this a permanent assumption going forward, but for now, it'd keep things consistent. And, after all, the "Main" user of the device probably is an Admin for the devices using HSUM so far. Bug: 256624031 Change-Id: I46a26d3a8a93dc52cfe48963215a03aa8636f90c Test: atest UserManagerTest --- .../core/java/com/android/server/pm/UserManagerService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java index ce4a2ed488baa..4a4a231f4fbaa 100644 --- 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;