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

Commit 9c45681c authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by Android (Google) Code Review
Browse files

Merge "Don't crash if default supervision profile owner is not set"

parents 7ce882a3 bd27c365

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

+3 −0
Original line number Diff line number Diff line
@@ -8594,6 +8594,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;