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