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

Commit 1024e3a0 authored by Svetoslav's avatar Svetoslav Committed by Android Git Automerger
Browse files

am f38b9c2e: am 0e58b6ab: am 1a55dcce: am dc876b56: Merge "Fix a NPE in device... 

am f38b9c2e: am 0e58b6ab: am 1a55dcce: am dc876b56: Merge "Fix a NPE in device policy manager service." into lmp-dev

* commit 'f38b9c2e':
  Fix a NPE in device policy manager service.
parents db2031e2 f38b9c2e

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();