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

Commit fd5c3d25 authored by Rubin Xu's avatar Rubin Xu Committed by Android (Google) Code Review
Browse files

Merge "Fix bug of unable to suspend packages after reboot" into main

parents 574c725a d2b4b028

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

+2 −3
Original line number Original line Diff line number Diff line
@@ -13292,11 +13292,10 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
        Set<String> suspendedPackagesBefore = mDevicePolicyEngine.getResolvedPolicy(

        Set<String> suspendedPackagesBefore = mDevicePolicyEngine.getResolvedPolicy(

                PolicyDefinition.PACKAGES_SUSPENDED, caller.getUserId());

                PolicyDefinition.PACKAGES_SUSPENDED, caller.getUserId());

















        Set<String> currentPackages = mDevicePolicyEngine.getLocalPolicySetByAdmin(







        Set<String> currentPackages = new ArraySet<>(mDevicePolicyEngine.getLocalPolicySetByAdmin(











                PolicyDefinition.PACKAGES_SUSPENDED,







                PolicyDefinition.PACKAGES_SUSPENDED,











                enforcingAdmin,







                enforcingAdmin,











                caller.getUserId());







                caller.getUserId()));











        if (currentPackages == null) currentPackages = new ArraySet<>();














        if (suspended) {







        if (suspended) {











            currentPackages.addAll(packages);







            currentPackages.addAll(packages);











        } else {







        } else {