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

Commit 5e093d99 authored by Badhri Jagan Sridharan's avatar Badhri Jagan Sridharan Committed by Gerrit Code Review
Browse files

Merge "Overcome disconnect during oem override"

parents 08498c32 65a62372

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

+3 −2
Original line number Diff line number Diff line
@@ -434,6 +434,8 @@ public class UsbDeviceManager { 
            try {

                // Restore default functions.



                mCurrentOemFunctions = SystemProperties.get(UsbDeviceManager.getPersistProp(false),

                        UsbManager.USB_FUNCTION_NONE);

                if (isNormalBoot()) {

                    mCurrentFunctions = SystemProperties.get(USB_CONFIG_PROPERTY,

                            UsbManager.USB_FUNCTION_NONE);
@@ -662,8 +664,7 @@ public class UsbDeviceManager { 
            }



            if ((!functions.equals(oemFunctions) &&

                    (mCurrentOemFunctions == null ||

                            !mCurrentOemFunctions.equals(oemFunctions)))

                            !mCurrentOemFunctions.equals(oemFunctions))

                    || !mCurrentFunctions.equals(functions)

                    || !mCurrentFunctionsApplied

                    || forceRestart) {