| commit | 2a6cdc554e5d358810a139d10ff6f0d6e4f3301c | [log] [tgz] |
|---|---|---|
| author | Quang Luong <qal@google.com> | Tue Mar 05 17:35:45 2019 -0800 |
| committer | Quang Luong <qal@google.com> | Fri Mar 08 17:16:38 2019 -0800 |
| tree | 3fe34e6bdaf1dbb96db2077e33e31ed3fb855e39 | |
| parent | f554792c8d7c7aec953d9b31e088e72d639fd93a [diff] |
Added Passpoint prefix to Passpoint related methods in WifiInfo Passpoint prefixes were added and changed getter methods to public API Bug: 127544936 Test: atest AccessPointTest && atest WifiInfoTest Change-Id: I445606e76352dfc445344109be735da4bbab12be
diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java index 4fc62bb..3304029 100644 --- a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
@@ -1069,7 +1069,7 @@ return (info.isOsuAp() && mOsuStatus != null); } else if (info.isPasspointAp() || isPasspoint()) { return (info.isPasspointAp() && isPasspoint() - && TextUtils.equals(info.getFqdn(), mConfig.FQDN)); + && TextUtils.equals(info.getPasspointFqdn(), mConfig.FQDN)); } if (networkId != WifiConfiguration.INVALID_NETWORK_ID) {
diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiStatusTracker.java b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiStatusTracker.java index 3c10688..2ab369c 100644 --- a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiStatusTracker.java +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiStatusTracker.java
@@ -118,7 +118,7 @@ mWifiInfo = mWifiManager.getConnectionInfo(); if (mWifiInfo != null) { if (mWifiInfo.isPasspointAp() || mWifiInfo.isOsuAp()) { - ssid = mWifiInfo.getProviderFriendlyName(); + ssid = mWifiInfo.getPasspointProviderFriendlyName(); } else { ssid = getValidSsid(mWifiInfo); }