From 15e164761095046aa9f9375dc141964c64d014e9 Mon Sep 17 00:00:00 2001
From: Sherry Hu <shuanghu@google.com>
Date: Tue, 16 Feb 2021 21:36:26 -0800
Subject: [PATCH] Add null check on UsbManager

Fix NPE from DevicePolicyManagerService since UsbService is not
available in ARC.

Bug: 180428336
Test: run DeviceBootTest
Change-Id: I23dce0c0bc1890477d2f31e43a3d54c01c0ef725
---
 .../server/devicepolicy/DevicePolicyManagerService.java       | 4 +++-
 1 file changed, 3 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 9772c2eaba577..0993febd62f1d 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -16701,6 +16701,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
     @Override
     public boolean canUsbDataSignalingBeDisabled() {
         return mInjector.binderWithCleanCallingIdentity(() ->
-                mInjector.getUsbManager().getUsbHalVersion() >= UsbManager.USB_HAL_V1_3);
+                mInjector.getUsbManager() != null
+                        && mInjector.getUsbManager().getUsbHalVersion() >= UsbManager.USB_HAL_V1_3
+        );
     }
 }