From 820ae5a47587f3d0a7bc4be9acb1c46c590c9860 Mon Sep 17 00:00:00 2001
From: Ashley Smith <ashleymarie@google.com>
Date: Thu, 12 May 2016 10:34:33 -0400
Subject: [PATCH] Fixing a NPE in DevicePolicyManagerService

Bug: 28786940
Change-Id: I73de8dea9221765ed0751039f3d472cf78d341af
---
 .../server/devicepolicy/DevicePolicyManagerService.java      | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index 3cc3edf828027..4dbead248ec61 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -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 {