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

Commit fb33ed9a authored by Mayank Garg's avatar Mayank Garg Committed by Android (Google) Code Review
Browse files

Merge "Always allow System user to change device config in case of... 

Merge "Always allow System user to change device config in case of Multi-user-multi-display (MUMD)" into main
parents 7c3e87f5 f14825b1

packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

+4 −4
Original line number Diff line number Diff line
@@ -2479,10 +2479,10 @@ public class SettingsProvider extends ContentProvider { 
        final long identity = Binder.clearCallingIdentity();

        try {

            int currentUser = ActivityManager.getCurrentUser();

            if (callingUser == currentUser) {

                // enforce the deny list only if the caller is not current user. Currently only auto

                // uses background visible user, and auto doesn't support profiles so profiles of

                // current users is not checked here.

            if (callingUser == currentUser || callingUser == UserHandle.USER_SYSTEM) {

                // enforce the deny list only if the caller is not current user or not a system

                // user. Currently only auto uses background visible user, and auto doesn't

                // support profiles so profiles of current users is not checked here.

                return;

            }

        } finally {