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

Commit aab20256 authored by Jerry Zhang's avatar Jerry Zhang Committed by Android (Google) Code Review
Browse files

Merge "Initialize functions as NONE in legacy handler."

parents ddd4ca1e 20b1414f

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

+1 −3
Original line number Original line Diff line number Diff line
@@ -1359,9 +1359,7 @@ public class UsbDeviceManager implements ActivityManagerInternal.ScreenObserver 
                            UsbManager.USB_FUNCTION_NONE).equals(

                            UsbManager.USB_FUNCTION_NONE).equals(

                            getSystemProperty(USB_STATE_PROPERTY, UsbManager.USB_FUNCTION_NONE));

                            getSystemProperty(USB_STATE_PROPERTY, UsbManager.USB_FUNCTION_NONE));

                }

                }

                // Mask out adb, since it is stored in mAdbEnabled

                mCurrentFunctions = UsbManager.FUNCTION_NONE;

                mCurrentFunctions = UsbManager.usbFunctionsFromString(mCurrentFunctionsStr)

                        & ~UsbManager.FUNCTION_ADB;

                mCurrentUsbFunctionsReceived = true;

                mCurrentUsbFunctionsReceived = true;





                String state = FileUtils.readTextFile(new File(STATE_PATH), 0, null).trim();

                String state = FileUtils.readTextFile(new File(STATE_PATH), 0, null).trim();