diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-08-02 15:31:34 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-02 15:31:34 -0700 |
| commit | 8a32c6333ab44c79a55ffa4ad9de93a7e6df2bda (patch) | |
| tree | 78083ee0d5f6b0d8e4cbf29d3828adb64a637cac /services/java | |
| parent | 147200b2c47fc36e7cba32b6e318643f25be3baf (diff) | |
| parent | 8b4d36e8661e25fcb893e00be15ba02da0950055 (diff) | |
| download | frameworks_base-8a32c6333ab44c79a55ffa4ad9de93a7e6df2bda.zip frameworks_base-8a32c6333ab44c79a55ffa4ad9de93a7e6df2bda.tar.gz frameworks_base-8a32c6333ab44c79a55ffa4ad9de93a7e6df2bda.tar.bz2 | |
Merge "USB: Fix NPE that occurred when restoring default function in UsbManager.setEnabledFunctions"
Diffstat (limited to 'services/java')
| -rw-r--r-- | services/java/com/android/server/usb/UsbDeviceManager.java | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/services/java/com/android/server/usb/UsbDeviceManager.java b/services/java/com/android/server/usb/UsbDeviceManager.java index dcf040a..86de880 100644 --- a/services/java/com/android/server/usb/UsbDeviceManager.java +++ b/services/java/com/android/server/usb/UsbDeviceManager.java @@ -388,13 +388,12 @@ public class UsbDeviceManager { } private void setEnabledFunctions(String functions, boolean makeDefault) { - if (mAdbEnabled) { - functions = addFunction(functions, UsbManager.USB_FUNCTION_ADB); - } else { - functions = removeFunction(functions, UsbManager.USB_FUNCTION_ADB); - } - if (functions != null && makeDefault) { + if (mAdbEnabled) { + functions = addFunction(functions, UsbManager.USB_FUNCTION_ADB); + } else { + functions = removeFunction(functions, UsbManager.USB_FUNCTION_ADB); + } 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"); |