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

Commit bbf0d298 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Check usb functions support with USB Gadget Hal version" into sc-dev

parents eeeb4697 6e0af90a

services/usb/java/com/android/server/usb/UsbDeviceManager.java

+6 −0
Original line number Diff line number Diff line
@@ -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) {