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

Commit bd771b8f authored by Sherry Hu's avatar Sherry Hu Committed by Android (Google) Code Review
Browse files

Merge "Add null check on UsbManager" into sc-dev

parents c418d4ef 15e16476

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+3 −1
Original line number Diff line number Diff line
@@ -16723,6 +16723,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

        );

    }

}