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

Commit f050665a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix bug in activity resolving logic" into udc-dev am: c0e77909 am:... 

Merge "Fix bug in activity resolving logic" into udc-dev am: c0e77909 am: 117b967a am: a8985588

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23305597



Change-Id: Ie0fa221413e4f5d076e3fe2896c526b24adcd91f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c4b7b5de a8985588

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",