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

Commit 20f98b05 authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE in DevicePolicyManagerService"

parents e517ce45 9fcff5aa

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) {