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

Commit c9a73bca authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Fix leaks of personal apps in setApplicationHidden" into rvc-dev am:... 

Merge "Fix leaks of personal apps in setApplicationHidden" into rvc-dev am: deae2467 am: 5f0e550a am: 66e3c574 am: 385b6381

Change-Id: I92915f7e2b7cf64d5091b727155f05d2cb8a7d55
parents 0fc8b294 385b6381

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

+8 −3
Original line number Diff line number Diff line
@@ -10912,9 +10912,14 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 














    private void enforcePackageIsSystemPackage(String packageName, int userId)















            throws RemoteException {













        if (!isSystemApp(mIPackageManager, packageName, userId)) {













            throw new IllegalArgumentException(













                    "The provided package is not a system package");













        boolean isSystem;













        try {













            isSystem = isSystemApp(mIPackageManager, packageName, userId);













        } catch (IllegalArgumentException e) {













            isSystem = false;













        }













        if (!isSystem) {













            throw new IllegalArgumentException("The provided package is not a system package");















        }















    }