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

Commit c0e77909 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix bug in activity resolving logic" into udc-dev

parents c6ffe347 05bdac0b

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

+3 −6
Original line number Diff line number Diff line
@@ -1092,12 +1092,9 @@ final class DevicePolicyEngine { 
                if (policies.get(admin).getValue() != null

                        && policies.get(admin).getValue().getPackageName().equals(packageName)) {

                    try {

                        if (packageManager.getPackageInfo(

                                packageName, 0, userId) == null

                                || packageManager.getReceiverInfo(policies.get(admin).getValue(),

                                PackageManager.MATCH_DIRECT_BOOT_AWARE

                                        | PackageManager.MATCH_DIRECT_BOOT_UNAWARE,

                                userId) == null) {

                        if (packageManager.getPackageInfo(packageName, 0, userId) == null

                                || packageManager.getActivityInfo(

                                        policies.get(admin).getValue(), 0, userId) == null) {

                            Slogf.e(TAG, String.format(

                                    "Persistent preferred activity in package %s not found for "

                                            + "user %d, removing policy for admin",