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

Commit afd07cb0 authored by Badhri Jagan Sridharan's avatar Badhri Jagan Sridharan Committed by android-build-merger
Browse files

Merge "Overcome disconnect during oem override" am: 5e093d99 

am: 961cc186

Change-Id: I2e34b0795448cee1aca306202f61e491c80bd78e
parents 2175e526 961cc186

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) {