From fd5af1b03c34b4726e1b37076218a35ed1256369 Mon Sep 17 00:00:00 2001 From: Elis Elliott Date: Mon, 20 Feb 2023 17:47:02 +0000 Subject: [PATCH] Don't set user restrictions directly on USER_ALL. Bug: 269984638 Test: btest a.d.c.InstallUnknownSourcesTest Change-Id: Id71b1fb3af41afe722d336d33628bc1b222205c8 (cherry picked from commit b2d13e50b4b1366abaefb87134de4577a6916688) Merged-In: Id71b1fb3af41afe722d336d33628bc1b222205c8 --- .../core/java/com/android/server/pm/UserManagerService.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java index 58ae95568e3bc..dd014ee637c78 100644 --- a/services/core/java/com/android/server/pm/UserManagerService.java +++ b/services/core/java/com/android/server/pm/UserManagerService.java @@ -2592,6 +2592,9 @@ public class UserManagerService extends IUserManager.Stub { applyUserRestrictionsForAllUsersLR(); for (int i = 0; i < updatedUserIds.size(); i++) { + if (updatedUserIds.get(i) == UserHandle.USER_ALL) { + continue; + } applyUserRestrictionsLR(updatedUserIds.get(i)); } }