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

Commit 68a2a0fe authored by Ashley Smith's avatar Ashley Smith
Browse files

Fixing NPE in device policy tests 

Bug: 30224255
Change-Id: I5c21f8d0e5660cca1cf7861649195672348f802c
parent 31cde3cd

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

+4 −2
Original line number Diff line number Diff line
@@ -5874,8 +5874,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);

        }