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

Commit d83eee94 authored by Ashley Smith's avatar Ashley Smith Committed by android-build-merger
Browse files

Fixing NPE in device policy tests 

am: 68a2a0fe

Change-Id: Ic637f7380d674e17b82ce417df82b8e940f92aa8
parents 4c7934c9 68a2a0fe

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

+4 −2
Original line number Diff line number Diff line
@@ -5876,8 +5876,10 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
        updateDeviceOwnerLocked();

        disableSecurityLoggingIfNotCompliant();

        try {

            if (mInjector.getIBackupManager() != null) {

                // Reactivate backup service.

                mInjector.getIBackupManager().setBackupServiceActive(UserHandle.USER_SYSTEM, true);

            }

        } catch (RemoteException e) {

            throw new IllegalStateException("Failed reactivating backup service.", e);

        }