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

Commit b6c64857 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Don't crash if default supervision profile owner is not set" into sc-dev

parents 0aee9a81 bcb5ee6f

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

+3 −0
Original line number Diff line number Diff line
@@ -8817,6 +8817,9 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
                return null;

            }

            final ComponentName supervisorComponent = ComponentName.unflattenFromString(supervisor);

            if (supervisorComponent == null) {

                return null;

            }

            if (supervisorComponent.equals(doComponent) || supervisorComponent.equals(

                    poComponent)) {

                return supervisorComponent;