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

Commit ab696e12 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13875207

Change-Id: I68da0a5d2381844f001413d0563d7dd16dec0fbb
parents be936f35 b6c64857

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

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

                return null;

            }

            }

            final ComponentName supervisorComponent = ComponentName.unflattenFromString(supervisor);

            final ComponentName supervisorComponent = ComponentName.unflattenFromString(supervisor);

            if (supervisorComponent == null) {

                return null;

            }

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

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

                    poComponent)) {

                    poComponent)) {

                return supervisorComponent;

                return supervisorComponent;