diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-08-02 18:16:26 -0400 |
|---|---|---|
| committer | Mike Lockwood <lockwood@android.com> | 2011-08-02 18:18:09 -0400 |
| commit | 8b4d36e8661e25fcb893e00be15ba02da0950055 (patch) | |
| tree | ae394424716968d267be7060ad193ffccda5c912 | |
| parent | ff7fffab23357cf81eb5f7ad50615f276510ae61 (diff) | |
| download | frameworks_base-8b4d36e8661e25fcb893e00be15ba02da0950055.zip frameworks_base-8b4d36e8661e25fcb893e00be15ba02da0950055.tar.gz frameworks_base-8b4d36e8661e25fcb893e00be15ba02da0950055.tar.bz2 | |
USB: Fix NPE that occurred when restoring default function in UsbManager.setEnabledFunctions
Bug: 5110020
Change-Id: I5e4b5c27e4675fa6830823832ae51411dc448191
Signed-off-by: Mike Lockwood <lockwood@android.com>
| -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"); |