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

Commit 5e3fafee authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Show connection error reason for Passpoint AP" am: 855889b0... 

Merge "Merge "Show connection error reason for Passpoint AP" am: 855889b0 am: 4896a040 am: 012a9c1f"
parents 8020105f 3a22f916

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -503,7 +503,8 @@ public class AccessPoint implements Comparable<AccessPoint> { 
            // This is the active connection on non-passpoint network

            // This is the active connection on non-passpoint network

            summary.append(getSummary(mContext, getDetailedState(),

            summary.append(getSummary(mContext, getDetailedState(),

                    mInfo != null && mInfo.isEphemeral()));

                    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);

            String format = mContext.getString(R.string.available_via_passpoint);

            summary.append(String.format(format, config.providerFriendlyName));

            summary.append(String.format(format, config.providerFriendlyName));

        } else if (config != null && config.hasNoInternetAccess()) {

        } else if (config != null && config.hasNoInternetAccess()) {