Merge "Merge "Return PO or DO for POLICY_SUSPEND_PACKAGES" into sc-qpr1-dev... (304e45de) · Commits · e / os / android_frameworks_base

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

+8 −3

Original line number	Diff line number	Diff line
		@@ -13186,12 +13186,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();