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

Commit 4896a040 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

Change-Id: I164f575dfc5dd69912f433e46b1d70b1fd11b1e6
parents 8e32c1b7 855889b0

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

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