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

Browse Source
This commit is contained in:
Ashley Smith
2016-05-16 17:40:22 +00:00
committed by Android (Google) Code Review
parent b0d38b6d47 820ae5a475
commit 6c917901cf
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. // Shutting down backup manager service permanently.
long ident = mInjector.binderClearCallingIdentity(); long ident = mInjector.binderClearCallingIdentity();
try { try {
mInjector.getIBackupManager().setBackupServiceActive(UserHandle.USER_SYSTEM, false); if (mInjector.getIBackupManager() != null) {
mInjector.getIBackupManager()
.setBackupServiceActive(UserHandle.USER_SYSTEM, false);
}
} catch (RemoteException e) { } catch (RemoteException e) {
throw new IllegalStateException("Failed deactivating backup service.", e); throw new IllegalStateException("Failed deactivating backup service.", e);
} finally { } finally {