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

Commit bcb5ee6f authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk
Browse files

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

Bug: 175430552
Test: build, flash, watch logcat

Change-Id: If441946fa278c04ae88122f6243f5a7dedd96ebc
(cherry picked from commit bd27c365)
parent 1fcb030d

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;