Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Check printing restriction for correct user."

Browse Source
This commit is contained in:
Vladislav Kuzkokov
2018-02-26 16:11:10 +00:00
committed by Android (Google) Code Review
parent 4993e55242 bc630497b4
commit 0ec75beab7
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -10419,7 +10419,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;
}

3
services/print/java/com/android/server/print/PrintManagerService.java
View File

@@ -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,