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

Commit 9fcff5aa authored by Jason Monk's avatar Jason Monk
Browse files

Fix NPE in DevicePolicyManagerService 

Bug: 15015897
Change-Id: Id9f6ae8b5abf96d35f799b150210813fb52da54c
parent 9d08a93b

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

+13 −11
Original line number Diff line number Diff line
@@ -1214,6 +1214,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
        }

        mAppOpsService = IAppOpsService.Stub.asInterface(

                ServiceManager.getService(Context.APP_OPS_SERVICE));

        if (mDeviceOwner != null) {

            if (mDeviceOwner.hasDeviceOwner()) {

                try {

                    mAppOpsService.setDeviceOwner(mDeviceOwner.getDeviceOwnerPackageName());
@@ -1229,6 +1230,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
                }

            }

        }

    }



    private void handlePasswordExpirationNotification(int userHandle) {

        synchronized (this) {