diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java index 2e692e6e68f72..7f24c365237d3 100644 --- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java +++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java @@ -2139,6 +2139,12 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser Slog.d(TAG, "setEnabledFunctions functions=" + functions + ", " + "forceRestart=" + forceRestart); } + if (mCurrentGadgetHalVersion < UsbManager.GADGET_HAL_V1_2) { + if ((functions & UsbManager.FUNCTION_NCM) != 0) { + Slog.e(TAG, "Could not set unsupported function for the GadgetHal"); + return; + } + } if (mCurrentFunctions != functions || !mCurrentFunctionsApplied || forceRestart) {