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

Commit 1513ff17 authored by Craig Mautner's avatar Craig Mautner
Browse files

Fix NPE when load() returns nulls. 

Fixes bug 20528625.

Change-Id: I825c95fd212a1928a34e9ed0e20d2f7563939cbb
parent 3f3a2a87

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 {