Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15e16476 authored by Sherry Hu's avatar Sherry Hu
Browse files

Add null check on UsbManager

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

Bug: 180428336
Test: run DeviceBootTest
Change-Id: I23dce0c0bc1890477d2f31e43a3d54c01c0ef725
parent c54e6552
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -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
        );
    }
}