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

Merge "Merge "Show connection error reason for Passpoint AP" am: 855889b086 am: 4896a04013 am: 012a9c1f6e"

Browse Source
This commit is contained in:
Android Build Merger (Role)
2017-02-17 22:40:52 +00:00
committed by Android (Google) Code Review
parent 8020105fb2 3a22f91638
commit 5e3fafee29
1 changed files with 2 additions and 1 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

@@ -503,7 +503,8 @@ public class AccessPoint implements Comparable<AccessPoint> {
// This is the active connection on non-passpoint network
summary.append(getSummary(mContext, getDetailedState(),
mInfo != null && mInfo.isEphemeral()));
} else if (config != null && config.isPasspoint()) {
} else if (config != null && config.isPasspoint()
&& config.getNetworkSelectionStatus().isNetworkEnabled()) {
String format = mContext.getString(R.string.available_via_passpoint);
summary.append(String.format(format, config.providerFriendlyName));
} else if (config != null && config.hasNoInternetAccess()) {