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

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

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

parents ea496644 28433dbd

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

+3 −0
Original line number Diff line number Diff line
@@ -5320,6 +5320,9 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
        @Override

        public List<String> getCrossProfileWidgetProviders(int profileId) {

            synchronized (DevicePolicyManagerService.this) {

                if (mDeviceOwner == null) {

                    return Collections.emptyList();

                }

                ComponentName ownerComponent = mDeviceOwner.getProfileOwnerComponent(profileId);

                if (ownerComponent == null) {

                    return Collections.emptyList();