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

Commit 641ea634 authored by Kenny Guy's avatar Kenny Guy Committed by Android (Google) Code Review
Browse files

Merge "DPMS shouldn't remove admins that aren't crypto aware." into nyc-dev

parents 567704bc 44fc4aeb

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

+4 −2
Original line number Diff line number Diff line
@@ -1249,7 +1249,9 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
                    if (packageName == null || packageName.equals(adminPackage)) {

                        if (mIPackageManager.getPackageInfo(adminPackage, 0, userHandle) == null

                                || mIPackageManager.getReceiverInfo(

                                    aa.info.getComponent(), 0, userHandle) == null) {

                                    aa.info.getComponent(),

                                    PackageManager.MATCH_ENCRYPTION_AWARE_AND_UNAWARE,

                                    userHandle) == null) {

                            removed = true;

                            policy.mAdminList.remove(i);

                            policy.mAdminMap.remove(aa.info.getComponent());
@@ -7137,7 +7139,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
                List<ResolveInfo> activitiesToEnable = mIPackageManager.queryIntentActivities(

                        intent,

                        intent.resolveTypeIfNeeded(mContext.getContentResolver()),

                        0, // no flags

                        PackageManager.MATCH_ENCRYPTION_AWARE_AND_UNAWARE,

                        parentUserId);



                if (VERBOSE_LOG) {