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

Commit 3a22f916 authored by Yuxin Chang's avatar Yuxin Chang Committed by android-build-merger
Browse files

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

am: 012a9c1f

Change-Id: Icde372b38103016deec0670e66ba8bb821a21a4f
parents 55e5cec7 012a9c1f

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

+2 −1
Original line number Diff line number Diff line
@@ -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()) {