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

Commit 8a32c633 authored by Mike Lockwood's avatar Mike Lockwood Committed by Android (Google) Code Review
Browse files

Merge "USB: Fix NPE that occurred when restoring default function in... 

Merge "USB: Fix NPE that occurred when restoring default function in UsbManager.setEnabledFunctions"
parents 147200b2 8b4d36e8

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

+10 −6
Original line number Diff line number Diff line
@@ -388,13 +388,12 @@ public class UsbDeviceManager { 
        }



        private void setEnabledFunctions(String functions, boolean makeDefault) {

            if (functions != null && makeDefault) {

                if (mAdbEnabled) {

                    functions = addFunction(functions, UsbManager.USB_FUNCTION_ADB);

                } else {

                    functions = removeFunction(functions, UsbManager.USB_FUNCTION_ADB);

                }



            if (functions != null && makeDefault) {

                if (!mDefaultFunctions.equals(functions)) {

                    if (!setUsbConfig("none")) {

                        Slog.e(TAG, "Failed to disable USB");
@@ -418,6 +417,11 @@ public class UsbDeviceManager { 
                if (functions == null) {

                    functions = mDefaultFunctions;

                }

                if (mAdbEnabled) {

                    functions = addFunction(functions, UsbManager.USB_FUNCTION_ADB);

                } else {

                    functions = removeFunction(functions, UsbManager.USB_FUNCTION_ADB);

                }

                if (!mCurrentFunctions.equals(functions)) {

                    if (!setUsbConfig("none")) {

                        Slog.e(TAG, "Failed to disable USB");