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

Commit 67d9c792 authored by Ashley Smith's avatar Ashley Smith Committed by Android (Google) Code Review
Browse files

Merge "Fixing NPE in device policy tests" into cw-f-dev

parents af5b3738 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);

        }