diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-07-18 10:54:32 -0700 |
|---|---|---|
| committer | Mike Lockwood <lockwood@android.com> | 2011-07-18 10:54:32 -0700 |
| commit | 875c24b897919a80a711dc79cf625006f1ff366d (patch) | |
| tree | d419cc6615b32f4ddce70e45d2aea00cb74cee98 /services | |
| parent | 7adcdecf808fce832b8711aeeeb30b73371ee4ae (diff) | |
| download | frameworks_base-875c24b897919a80a711dc79cf625006f1ff366d.zip frameworks_base-875c24b897919a80a711dc79cf625006f1ff366d.tar.gz frameworks_base-875c24b897919a80a711dc79cf625006f1ff366d.tar.bz2 | |
UsbManager: document that passing null setCurrentFunction restores default function
Change-Id: I4340b336f3e91b3b8242f2a66c34a7a7f5c3021f
Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/usb/UsbDeviceManager.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/services/java/com/android/server/usb/UsbDeviceManager.java b/services/java/com/android/server/usb/UsbDeviceManager.java index 3139798..c80cd0a 100644 --- a/services/java/com/android/server/usb/UsbDeviceManager.java +++ b/services/java/com/android/server/usb/UsbDeviceManager.java @@ -473,10 +473,7 @@ public class UsbDeviceManager { case MSG_SET_CURRENT_FUNCTION: String function = (String)msg.obj; boolean makeDefault = (msg.arg1 == 1); - if (makeDefault) { - if (function == null) { - throw new NullPointerException(); - } + if (function != null && makeDefault) { if (mAdbEnabled) { function = addFunction(function, UsbManager.USB_FUNCTION_ADB); } |