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

Fixing a NPE in DevicePolicyManagerService

Browse Source 
Bug: 28786940
Change-Id: I73de8dea9221765ed0751039f3d472cf78d341af
This commit is contained in:
Ashley Smith
2016-05-12 10:34:33 -04:00
parent cef3337cb5
commit 820ae5a475
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 {