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

Commit 915fea20 authored by Sherry Hu's avatar Sherry Hu Committed by Automerger Merge Worker
Browse files

Merge "Add null check on UsbManager" into sc-dev am: bd771b8f 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13596231

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I62973f749c8ac7237807068ebb603afec21883ae
parents 94b7bee4 bd771b8f

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

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

        );

    }

}