From 0df143834ad0d817357f994deb5f0ca9ba8df093 Mon Sep 17 00:00:00 2001
From: Quang Luong <qal@google.com>
Date: Wed, 20 Feb 2019 17:45:32 -0800
Subject: [PATCH] Use getTitle() for AccessPoint display name

Instead of getSsidStr(), AccessPoint display names should use
getTitle() to accomodate Passpoint networks which use a provider
name instead of a single ssid. This change allows the provider
name to be displayed in the network details page, the long
press wifi dialog, and the config editing dialog.

Bug: 118705403
Test: atest WifiSettingsTest
Change-Id: I930d6218c7e464ad20c0c61130e0cb9ce315d9a2
---
 src/com/android/settings/wifi/WifiConfigController.java     | 6 +-----
 src/com/android/settings/wifi/WifiSettings.java             | 2 +-
 .../wifi/details/WifiDetailPreferenceController.java        | 2 +-
 .../wifi/details/WifiDetailPreferenceControllerTest.java    | 6 +++---
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index e7db5db9b81..4b3de2a7766 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -265,11 +265,7 @@ public class WifiConfigController implements TextWatcher,
             configureSecuritySpinner();
             mConfigUi.setSubmitButton(res.getString(R.string.wifi_save));
         } else {
-            if (!mAccessPoint.isPasspointConfig()) {
-                mConfigUi.setTitle(mAccessPoint.getSsid());
-            } else {
-                mConfigUi.setTitle(mAccessPoint.getConfigName());
-            }
+            mConfigUi.setTitle(mAccessPoint.getTitle());
 
             ViewGroup group = (ViewGroup) mView.findViewById(R.id.info);
 
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index c00fe249308..d6ddff675d6 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -483,7 +483,7 @@ public class WifiSettings extends RestrictedSettingsFragment
         if (preference instanceof LongPressAccessPointPreference) {
             mSelectedAccessPoint =
                     ((LongPressAccessPointPreference) preference).getAccessPoint();
-            menu.setHeaderTitle(mSelectedAccessPoint.getSsid());
+            menu.setHeaderTitle(mSelectedAccessPoint.getTitle());
             if (mSelectedAccessPoint.isConnectable()) {
                 menu.add(Menu.NONE, MENU_ID_CONNECT, 0, R.string.wifi_menu_connect);
             }
diff --git a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
index 01673e37f4c..7aa2facbd01 100644
--- a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
+++ b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
@@ -327,7 +327,7 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController
                 mContext.getDrawable(R.drawable.ic_settings_widget_background));
         iconView.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
 
-        mEntityHeaderController.setLabel(mAccessPoint.getSsidStr());
+        mEntityHeaderController.setLabel(mAccessPoint.getTitle());
     }
 
     @Override
diff --git a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java
index 640c426fb68..e640deebdc1 100644
--- a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java
@@ -384,9 +384,9 @@ public class WifiDetailPreferenceControllerTest {
     }
 
     @Test
-    public void entityHeader_shouldHaveLabelSetToSsid() {
-        String label = "ssid";
-        when(mockAccessPoint.getSsidStr()).thenReturn(label);
+    public void entityHeader_shouldHaveLabelSetToTitle() {
+        String label = "title";
+        when(mockAccessPoint.getTitle()).thenReturn(label);
 
         displayAndResume();