From 72c0ebc290ad404acaee23860a5f3e1187cbda6c Mon Sep 17 00:00:00 2001 From: Quang Luong Date: Tue, 5 Mar 2019 17:06:33 -0800 Subject: [PATCH] Added case to change WifiStatusTracker SSID to Passpoint friendly name The name of the wifi network as shown in the Network & internet page and in QuickSettings will be the Passpoint provider friendly name if the connection is to a Passpoint or OSU network. Bug: 118705403 Test: m Change-Id: Ifd6271d67031a8626b5ddf4691c1674a64be31d6 --- .../src/com/android/settingslib/wifi/WifiStatusTracker.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiStatusTracker.java b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiStatusTracker.java index 871e2485a742a..3c106887641da 100644 --- a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiStatusTracker.java +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiStatusTracker.java @@ -117,7 +117,11 @@ public class WifiStatusTracker extends ConnectivityManager.NetworkCallback { if (connected) { mWifiInfo = mWifiManager.getConnectionInfo(); if (mWifiInfo != null) { - ssid = getValidSsid(mWifiInfo); + if (mWifiInfo.isPasspointAp() || mWifiInfo.isOsuAp()) { + ssid = mWifiInfo.getProviderFriendlyName(); + } else { + ssid = getValidSsid(mWifiInfo); + } updateRssi(mWifiInfo.getRssi()); maybeRequestNetworkScore(); }