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

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

Browse Source
This commit is contained in:
Ashley Smith
2016-08-08 16:22:38 +00:00
committed by Android (Google) Code Review
parent af5b373818 68a2a0feed
commit 67d9c792a8
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5876,8 +5876,10 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
updateDeviceOwnerLocked(); updateDeviceOwnerLocked();
disableSecurityLoggingIfNotCompliant(); disableSecurityLoggingIfNotCompliant();
try { try {
// Reactivate backup service. if (mInjector.getIBackupManager() != null) {
mInjector.getIBackupManager().setBackupServiceActive(UserHandle.USER_SYSTEM, true); // Reactivate backup service.
mInjector.getIBackupManager().setBackupServiceActive(UserHandle.USER_SYSTEM, true);
}
} catch (RemoteException e) { } catch (RemoteException e) {
throw new IllegalStateException("Failed reactivating backup service.", e); throw new IllegalStateException("Failed reactivating backup service.", e);
} }