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

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

Merge "Fixing a NPE in DevicePolicyManagerService" into nyc-dev am: 6c917901 am: 03905d07 

am: db5d4d47

* commit 'db5d4d47':
  Fixing a NPE in DevicePolicyManagerService

Change-Id: I3e407ef88443c81dbecd6abe4c31a5734321d959
parents 31f9c9e7 db5d4d47

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

+4 −1
Original line number Diff line number Diff line
@@ -5672,7 +5672,10 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
            // Shutting down backup manager service permanently.

            long ident = mInjector.binderClearCallingIdentity();

            try {

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

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

                    mInjector.getIBackupManager()

                            .setBackupServiceActive(UserHandle.USER_SYSTEM, false);

                }

            } catch (RemoteException e) {

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

            } finally {