Merge "Fix usb preference summary"

This commit is contained in:
TreeHugger Robot
2018-04-09 23:47:53 +00:00
committed by Android (Google) Code Review

View File

@@ -42,8 +42,8 @@ public class ConnectedUsbDeviceUpdater {
UsbConnectionBroadcastReceiver.UsbConnectionListener mUsbConnectionListener = UsbConnectionBroadcastReceiver.UsbConnectionListener mUsbConnectionListener =
(connected, functions, powerRole, dataRole) -> { (connected, functions, powerRole, dataRole) -> {
if (connected) { if (connected) {
mUsbPreference.setSummary(getSummary(mUsbBackend.getCurrentFunctions(), mUsbPreference.setSummary(getSummary(dataRole == UsbPort.DATA_ROLE_DEVICE
mUsbBackend.getPowerRole())); ? functions : UsbManager.FUNCTION_NONE, powerRole));
mDevicePreferenceCallback.onDeviceAdded(mUsbPreference); mDevicePreferenceCallback.onDeviceAdded(mUsbPreference);
} else { } else {
mDevicePreferenceCallback.onDeviceRemoved(mUsbPreference); mDevicePreferenceCallback.onDeviceRemoved(mUsbPreference);