commit fd5af1b03c34b4726e1b37076218a35ed1256369
author Elis Elliott <eliselliott@google.com> Mon Feb 20 17:47:02 2023 +0000
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> Tue Feb 21 10:49:30 2023 +0000
tree d04f15c6921b60b883ed506078874a6a7a60f57b
parent 707732f4520ca32273e344a3bb8c33906c38c241

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

services/core/java/com/android/server/pm/UserManagerService.java

diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java
index 58ae955..dd014ee 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 @@
 
             applyUserRestrictionsForAllUsersLR();
             for (int i = 0; i < updatedUserIds.size(); i++) {
+                if (updatedUserIds.get(i) == UserHandle.USER_ALL) {
+                    continue;
+                }
                 applyUserRestrictionsLR(updatedUserIds.get(i));
             }
         }