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

Merge "Return PO or DO for POLICY_SUSPEND_PACKAGES" into sc-qpr1-dev am: 3c7c22f4d9

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

Change-Id: I2cb17511834dc81357b6387ebc6289b24b69be4a
This commit is contained in:
Ayush Sharma
2022-01-19 23:10:53 +00:00
committed by Automerger Merge Worker
parent cdcc08dc74 3c7c22f4d9
commit 8155ff9b98
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13184,12 +13184,17 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
/**
* @param restriction The restriction enforced by admin. It could be any user restriction or
* policy like {@link DevicePolicyManager#POLICY_DISABLE_CAMERA} and
* {@link DevicePolicyManager#POLICY_DISABLE_SCREEN_CAPTURE}.
* policy like {@link DevicePolicyManager#POLICY_DISABLE_CAMERA},
* {@link DevicePolicyManager#POLICY_DISABLE_SCREEN_CAPTURE} and {@link
* DevicePolicyManager#POLICY_SUSPEND_PACKAGES}.
*/
private Bundle getEnforcingAdminAndUserDetailsInternal(int userId, String restriction) {
Bundle result = null;
if (restriction == null) {
// For POLICY_SUSPEND_PACKAGES return PO or DO to keep the behavior same as
// before the bug fix for b/192245204.
if (restriction == null || DevicePolicyManager.POLICY_SUSPEND_PACKAGES.equals(
restriction)) {
ComponentName profileOwner = mOwners.getProfileOwnerComponent(userId);
if (profileOwner != null) {
result = new Bundle();