diff options
| author | 2011-07-11 10:41:52 -0700 | |
|---|---|---|
| committer | 2011-07-11 10:41:52 -0700 | |
| commit | ce060f722a65b379805e81b5292253265d823ed1 (patch) | |
| tree | 7fe07761afeaa2ad2a742552bc8148703e870655 | |
| parent | e6d24ab6a96549940cf832fe8c86710f2f07631c (diff) | |
| parent | abc4ac6d48c52bd8b69026441bf261e5c68c24f4 (diff) | |
Merge "UsbDeviceManager: Fix indentation"
| -rw-r--r-- | services/java/com/android/server/usb/UsbDeviceManager.java | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/services/java/com/android/server/usb/UsbDeviceManager.java b/services/java/com/android/server/usb/UsbDeviceManager.java index d64516021c8a..1ab570a7a7f7 100644 --- a/services/java/com/android/server/usb/UsbDeviceManager.java +++ b/services/java/com/android/server/usb/UsbDeviceManager.java @@ -630,20 +630,20 @@ public class UsbDeviceManager { } /* opens the currently attached USB accessory */ - public ParcelFileDescriptor openAccessory(UsbAccessory accessory) { - UsbAccessory currentAccessory = mHandler.getCurrentAccessory(); - if (currentAccessory == null) { - throw new IllegalArgumentException("no accessory attached"); - } - if (!currentAccessory.equals(accessory)) { - String error = accessory.toString() - + " does not match current accessory " - + currentAccessory; - throw new IllegalArgumentException(error); - } - mSettingsManager.checkPermission(accessory); - return nativeOpenAccessory(); + public ParcelFileDescriptor openAccessory(UsbAccessory accessory) { + UsbAccessory currentAccessory = mHandler.getCurrentAccessory(); + if (currentAccessory == null) { + throw new IllegalArgumentException("no accessory attached"); } + if (!currentAccessory.equals(accessory)) { + String error = accessory.toString() + + " does not match current accessory " + + currentAccessory; + throw new IllegalArgumentException(error); + } + mSettingsManager.checkPermission(accessory); + return nativeOpenAccessory(); + } public void setCurrentFunction(String function, boolean makeDefault) { if (DEBUG) Slog.d(TAG, "setCurrentFunction(" + function + ") default: " + makeDefault); |