From 9d6aba32cb969567b811aa99eb11f5bfc58f99ea Mon Sep 17 00:00:00 2001 From: Jerry Zhang Date: Fri, 6 Apr 2018 12:06:49 -0700 Subject: [PATCH] Fix usb preference summary In host mode, summary should not display function info. Bug: 77647931 Test: passes Change-Id: Ic15849e12aa47df75cc75c9da0384e24627a9c8b --- .../connecteddevice/usb/ConnectedUsbDeviceUpdater.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java b/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java index 098cdb46ea7..451faba03a5 100644 --- a/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java +++ b/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java @@ -42,8 +42,8 @@ public class ConnectedUsbDeviceUpdater { UsbConnectionBroadcastReceiver.UsbConnectionListener mUsbConnectionListener = (connected, functions, powerRole, dataRole) -> { if (connected) { - mUsbPreference.setSummary(getSummary(mUsbBackend.getCurrentFunctions(), - mUsbBackend.getPowerRole())); + mUsbPreference.setSummary(getSummary(dataRole == UsbPort.DATA_ROLE_DEVICE + ? functions : UsbManager.FUNCTION_NONE, powerRole)); mDevicePreferenceCallback.onDeviceAdded(mUsbPreference); } else { mDevicePreferenceCallback.onDeviceRemoved(mUsbPreference);