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

Commit 00c79494 authored by Craig Mautner's avatar Craig Mautner Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE when load() returns nulls."

parents b3614b72 1513ff17

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

+1 −1
Original line number Diff line number Diff line
@@ -1672,7 +1672,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
        IActivityManager am = ActivityManagerNative.getDefault();

        long ident = Binder.clearCallingIdentity();

        try {

            am.updateDeviceOwner(mDeviceOwner.getDeviceOwnerPackageName());

            am.updateDeviceOwner(getDeviceOwner());

        } catch (RemoteException e) {

            // Not gonna happen.

        } finally {