summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHugo Benichi <hugobenichi@google.com>2017-03-13 07:40:25 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-03-13 07:40:25 +0000
commita5af24cd02f9dadbea7d23c59ce5f04ce045080d (patch)
treec8515afba9a88ca7dc3c21e8b73ad6efc1c4a77b
parentba1e74cd6ef6f2168a61c7ffab48671db96a57aa (diff)
parent3d61c893055d39f98149cd1d172948a5316c8c2b (diff)
Merge "Minor formatting cleanup to remove overlong line" am: d6998d4bd6 am: cc935f5e6d
am: 3d61c89305 Change-Id: I1a4311525a7b9674daa3713ca3ec7001d4bb30fe
-rw-r--r--services/usb/java/com/android/server/usb/UsbDeviceManager.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java
index b142bc2eb1a2..4178f4da7603 100644
--- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java
+++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java
@@ -776,7 +776,8 @@ public class UsbDeviceManager {
}
mMidiEnabled = enabled;
}
- mUsbAlsaManager.setPeripheralMidiState(mMidiEnabled && mConfigured, mMidiCard, mMidiDevice);
+ mUsbAlsaManager.setPeripheralMidiState(
+ mMidiEnabled && mConfigured, mMidiCard, mMidiDevice);
}
@Override