Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixing a NPE in DevicePolicyManagerService" into nyc-dev am: 6c917901cf

Browse Source 
am: a582dd0090

* commit 'a582dd00907786132ad8eac650965718fa9e7ba9':
  Fixing a NPE in DevicePolicyManagerService

Change-Id: Ifc64f674f02e707eec85a407c31dd20030dbfda0
This commit is contained in:
Ashley Smith
2016-05-16 17:47:12 +00:00
committed by android-build-merger
parent 5683dde60c a582dd0090
commit d8c3b39c59
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -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 {