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

Commit dd712a70 authored by Svetoslav's avatar Svetoslav Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE in device policy manager service." into lmp-dev

parents 58956a55 318f91b7

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

+4 −0
Original line number Diff line number Diff line
@@ -4584,6 +4584,10 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
            DevicePolicyData policy = getUserData(profileId);

            ActiveAdmin admin = policy.mAdminMap.get(ownerComponent);



            if (admin == null) {

                return Collections.emptyList();

            }



            if (admin.crossProfileWidgetProviders == null

                    || admin.crossProfileWidgetProviders.isEmpty()) {

                return Collections.emptyList();