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

Commit bc630497 authored by Vladislav Kuzkokov's avatar Vladislav Kuzkokov
Browse files

Check printing restriction for correct user. 

Work profile uses the same instance of PrintManager and DPM
as the primary user. We have to explicitly check restriction for calling user.

Bug: 73768054
Test: Set restriction in Work profile, check that it applies only in work profile.
Change-Id: Iaa63ce000fc84b7d0ee2bd0ff008f1c0f7272a87
parent 427ef56c

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -10410,7 +10410,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
        public CharSequence getPrintingDisabledReasonForUser(@UserIdInt int userId) {

            synchronized (DevicePolicyManagerService.this) {

                DevicePolicyData policy = getUserData(userId);

                if (!mUserManager.hasUserRestriction(UserManager.DISALLOW_PRINTING)) {

                if (!mUserManager.hasUserRestriction(UserManager.DISALLOW_PRINTING,

                        UserHandle.of(userId))) {

                    Log.e(LOG_TAG, "printing is enabled");

                    return null;

                }

services/print/java/com/android/server/print/PrintManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -718,7 +718,8 @@ public final class PrintManagerService extends SystemService { 
        }



        private boolean isPrintingEnabled() {

            return !mUserManager.hasUserRestriction(UserManager.DISALLOW_PRINTING);

            return !mUserManager.hasUserRestriction(UserManager.DISALLOW_PRINTING,

                    Binder.getCallingUserHandle());

        }



        private void dump(@NonNull DualDumpOutputStream dumpStream,