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

Commit 31af86f8 authored by Badhri Jagan Sridharan's avatar Badhri Jagan Sridharan
Browse files

Persist the functions from the 3rd column in oemOverride 

The oemOverrides were incorrectly persisted when adb was disabled.
This CL makes the functions in the 3rd column to be persisted.

Bug: 31947358
Test: Verify oemOverride
Change-Id: Iaef19f8ffd0c829a852a33778af96a6772d1c2ad
parent 1d7d6125

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

+1 −2
Original line number Diff line number Diff line
@@ -1193,8 +1193,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));