Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60743409 authored by Elis Elliott's avatar Elis Elliott Committed by Automerger Merge Worker
Browse files

Don't set user restrictions directly on USER_ALL. am: fd5af1b0 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21518370



Change-Id: Ifca1726a0df05d02feac54f30be9345f16b977b6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f01de27d fd5af1b0

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

+3 −0
Original line number Diff line number Diff line
@@ -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));

            }

        }