From 6b750865ed2f16ccb0cf9274dd3aad0889e180d8 Mon Sep 17 00:00:00 2001
From: Yuxin Chang <yuxin.x.chang@sonymobile.com>
Date: Wed, 11 Jan 2017 14:59:17 +0900
Subject: [PATCH] Show connection error reason for Passpoint AP

Currently "Available via <provider friendly name>" is always shown
in the summary with Passpoint AP, even connection error happens,
so user might not notice the error happens.

Better to show error reason when connection error happens,
so that user can notice the error and take actions to solve it.

Bug: 35190091

Change-Id: If0d06e800df8de3119590372feda946457aab5e6
---
 .../src/com/android/settingslib/wifi/AccessPoint.java          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
index 252aaab1522ab..ad41017f5910f 100644
--- a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
+++ b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
@@ -422,7 +422,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()) {