Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Unsaved carrier wifi connection should display carrier in summary" into qt-dev

Browse Source
This commit is contained in:
Quang Luong
2019-06-07 23:19:04 +00:00
committed by Android (Google) Code Review
parent e53837182c 4c23e8cbfb
commit 3d87a9920e
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
View File

@@ -999,8 +999,7 @@ public class AccessPoint implements Comparable<AccessPoint> {
summary.append(mContext.getString(R.string.tap_to_sign_up)); summary.append(mContext.getString(R.string.tap_to_sign_up));
} }
} else if (isActive()) { } else if (isActive()) {
if (mConfig != null && getDetailedState() == DetailedState.CONNECTED if (getDetailedState() == DetailedState.CONNECTED && mIsCarrierAp) {
&& mIsCarrierAp) {
// This is the active connection on a carrier AP // This is the active connection on a carrier AP
summary.append(String.format(mContext.getString(R.string.connected_via_carrier), summary.append(String.format(mContext.getString(R.string.connected_via_carrier),
mCarrierName)); mCarrierName));