Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 693ebf17 authored by Quang Luong's avatar Quang Luong Committed by android-build-merger
Browse files

Merge "Unsaved carrier wifi connection should display carrier in summary" into... 

Merge "Unsaved carrier wifi connection should display carrier in summary" into qt-dev am: 3d87a992
am: 44ba2ebd

Change-Id: Ia6b06ed5d5a392b51d89a291925a8f028fcd5b4d
parents 8533837d 44ba2ebd

packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java

+1 −2
Original line number Diff line number Diff line
@@ -999,8 +999,7 @@ public class AccessPoint implements Comparable<AccessPoint> { 
                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));