From 68a2a0feed79e8e8928785461740525f6e384960 Mon Sep 17 00:00:00 2001
From: Ashley Smith <ashleymarie@google.com>
Date: Fri, 5 Aug 2016 11:24:02 -0400
Subject: [PATCH] Fixing NPE in device policy tests

Bug: 30224255
Change-Id: I5c21f8d0e5660cca1cf7861649195672348f802c
---
 .../server/devicepolicy/DevicePolicyManagerService.java     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index feeed8b922da0..50ad88fb76593 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -5874,8 +5874,10 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
         updateDeviceOwnerLocked();
         disableSecurityLoggingIfNotCompliant();
         try {
-            // Reactivate backup service.
-            mInjector.getIBackupManager().setBackupServiceActive(UserHandle.USER_SYSTEM, true);
+            if (mInjector.getIBackupManager() != null) {
+                // Reactivate backup service.
+                mInjector.getIBackupManager().setBackupServiceActive(UserHandle.USER_SYSTEM, true);
+            }
         } catch (RemoteException e) {
             throw new IllegalStateException("Failed reactivating backup service.", e);
         }