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

Commit ad664808 authored by Benjamin Franz's avatar Benjamin Franz Committed by android-build-merger
Browse files

am 6d16b861: Merge "Avoid NullPointerException if createUser returns null" into lmp-mr1-dev 

automerge: 28056699

* commit '28056699':
  Avoid NullPointerException if createUser returns null
parents 20bd0c23 28056699

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

+3 −0
Original line number Diff line number Diff line
@@ -4734,6 +4734,9 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
    public UserHandle createAndInitializeUser(ComponentName who, String name,

            String ownerName, ComponentName profileOwnerComponent, Bundle adminExtras) {

        UserHandle user = createUser(who, name);

        if (user == null) {

            return null;

        }

        long id = Binder.clearCallingIdentity();

        try {

            String profileOwnerPkg = profileOwnerComponent.getPackageName();