From: Quang Luong Date: Fri, 7 Jun 2019 18:32:16 +0000 (-0700) Subject: Unsaved carrier wifi connection should display carrier in summary X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4c23e8cbfba8283bc525f7fbcd32d7718e676e62;p=android-x86%2Fframeworks-base.git Unsaved carrier wifi connection should display carrier in summary Autoconnected carrier wifi should display "Connected via " in the wifi picker even if the network has not been saved. Bug: 134525097 Test: atest AccessPointTest Change-Id: Id28daec3f80124f5329386ef5ff2b32cda505355 --- diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java index e28c612453b4..9036abc4e98e 100644 --- a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java @@ -999,8 +999,7 @@ public class AccessPoint implements Comparable { summary.append(mContext.getString(R.string.tap_to_sign_up)); } } else if (isActive()) { - if (mConfig != null && getDetailedState() == DetailedState.CONNECTED - && mIsCarrierAp) { + if (getDetailedState() == DetailedState.CONNECTED && mIsCarrierAp) { // This is the active connection on a carrier AP summary.append(String.format(mContext.getString(R.string.connected_via_carrier), mCarrierName));