diff options
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java | 3 | ||||
| -rw-r--r-- | services/print/java/com/android/server/print/PrintManagerService.java | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 875334413b5a..fb56e83e46a9 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -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; } diff --git a/services/print/java/com/android/server/print/PrintManagerService.java b/services/print/java/com/android/server/print/PrintManagerService.java index e8620edc9d5e..83a125d1fc36 100644 --- a/services/print/java/com/android/server/print/PrintManagerService.java +++ b/services/print/java/com/android/server/print/PrintManagerService.java @@ -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, |