Add null check on UsbManager

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

Bug: 180428336
Test: run DeviceBootTest
Change-Id: I23dce0c0bc1890477d2f31e43a3d54c01c0ef725
This commit is contained in:
Sherry Hu
2021-02-16 21:36:26 -08:00
parent c54e6552c7
commit 15e1647610

View File

@@ -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
);
}
}