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

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

Merge "Persist the functions from the 3rd column in oemOverride"

parents cbdd7032 31af86f8

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

+1 −2
Original line number Diff line number Diff line
@@ -1204,8 +1204,7 @@ public class UsbDeviceManager { 
                        newFunction = UsbManager.addFunction(overrideFunctions.second,

                                UsbManager.USB_FUNCTION_ADB);

                    } else {

                        newFunction = UsbManager.addFunction(UsbManager.USB_FUNCTION_NONE,

                                UsbManager.USB_FUNCTION_ADB);

                        newFunction = overrideFunctions.second;

                    }

                    Slog.d(TAG, "OEM USB override persisting: " + newFunction + "in prop: "

                            + UsbDeviceManager.getPersistProp(false));