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

Commit aa8c5e8f authored by Ayush Sharma's avatar Ayush Sharma
Browse files

Return PO or DO for POLICY_SUSPEND_PACKAGES 

For suspended packages workflow we used to return PO or DO for admin
support intent, which changed as part of fixing this bug :
b/192245204 and now we are returning null. So to revert to original
behavior returning PO or DO for POLICY_SUSPEND_PACKAGES case.

Bug: 210792656
Test: atest MixedDeviceOwnerTest#testCreateAdminSupportIntent
      atest MixedProfileOwnerTest#testCreateAdminSupportIntent
      atest MixedManagedProfileOwnerTest#testCreateAdminSupportIntent
      atest DevicePolicyManagerTest#testCreateAdminSupportIntent
      atest com.android.cts.devicepolicy.MixedDeviceOwnerTest#testSuspendPackage
Change-Id: Ice96fe5eb81b9049791b060287f0aea527868539
Merged-In: Ice96fe5eb81b9049791b060287f0aea527868539
(cherry picked from commit 97cfbb90)
parent 9a533b7e

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

+8 −3
Original line number Diff line number Diff line
@@ -13023,12 +13023,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();