From 2a6cdc554e5d358810a139d10ff6f0d6e4f3301c Mon Sep 17 00:00:00 2001 From: Quang Luong Date: Tue, 5 Mar 2019 17:35:45 -0800 Subject: [PATCH] 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 --- api/current.txt | 2 ++ api/system-current.txt | 2 -- .../com/android/settingslib/wifi/AccessPoint.java | 2 +- .../settingslib/wifi/WifiStatusTracker.java | 2 +- wifi/java/android/net/wifi/WifiInfo.java | 14 ++++++++------ wifi/tests/src/android/net/wifi/WifiInfoTest.java | 4 ++-- 6 files changed, 14 insertions(+), 12 deletions(-) diff --git a/api/current.txt b/api/current.txt index d26bb22fcca13..6074ceda84970 100644 --- a/api/current.txt +++ b/api/current.txt @@ -29939,6 +29939,8 @@ package android.net.wifi { method public int getLinkSpeed(); method public String getMacAddress(); method public int getNetworkId(); + method @Nullable public String getPasspointFqdn(); + method @Nullable public String getPasspointProviderFriendlyName(); method public int getRssi(); method @IntRange(from=0xffffffff) public int getRxLinkSpeedMbps(); method public String getSSID(); diff --git a/api/system-current.txt b/api/system-current.txt index 975e30071f4c9..e94cc0681307a 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -4717,8 +4717,6 @@ package android.net.wifi { } public class WifiInfo implements android.os.Parcelable { - method @Nullable public String getFqdn(); - method @Nullable public String getProviderFriendlyName(); method public boolean isOsuAp(); method public boolean isPasspointAp(); } diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java index 4fc62bb3937fa..3304029fc543f 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 @@ public class AccessPoint implements Comparable { 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 3c106887641da..2ab369cc2065f 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 @@ public class WifiStatusTracker extends ConnectivityManager.NetworkCallback { mWifiInfo = mWifiManager.getConnectionInfo(); if (mWifiInfo != null) { if (mWifiInfo.isPasspointAp() || mWifiInfo.isOsuAp()) { - ssid = mWifiInfo.getProviderFriendlyName(); + ssid = mWifiInfo.getPasspointProviderFriendlyName(); } else { ssid = getValidSsid(mWifiInfo); } diff --git a/wifi/java/android/net/wifi/WifiInfo.java b/wifi/java/android/net/wifi/WifiInfo.java index ee60408e85af1..0b557942c87bf 100644 --- a/wifi/java/android/net/wifi/WifiInfo.java +++ b/wifi/java/android/net/wifi/WifiInfo.java @@ -539,9 +539,10 @@ public class WifiInfo implements Parcelable { mFqdn = fqdn; } - /** {@hide} */ - @SystemApi - public @Nullable String getFqdn() { + /** + * Returns the Fully Qualified Domain Name of the network if it is a Passpoint network. + */ + public @Nullable String getPasspointFqdn() { return mFqdn; } @@ -550,9 +551,10 @@ public class WifiInfo implements Parcelable { mProviderFriendlyName = providerFriendlyName; } - /** {@hide} */ - @SystemApi - public @Nullable String getProviderFriendlyName() { + /** + * Returns the Provider Friendly Name of the network if it is a Passpoint network. + */ + public @Nullable String getPasspointProviderFriendlyName() { return mProviderFriendlyName; } diff --git a/wifi/tests/src/android/net/wifi/WifiInfoTest.java b/wifi/tests/src/android/net/wifi/WifiInfoTest.java index b3034965b5fce..0ce5d66cf4f70 100644 --- a/wifi/tests/src/android/net/wifi/WifiInfoTest.java +++ b/wifi/tests/src/android/net/wifi/WifiInfoTest.java @@ -70,7 +70,7 @@ public class WifiInfoTest { assertTrue(readWifiInfo.isOsuAp()); assertTrue(readWifiInfo.isPasspointAp()); assertEquals(TEST_PACKAGE_NAME, readWifiInfo.getNetworkSuggestionOrSpecifierPackageName()); - assertEquals(TEST_FQDN, readWifiInfo.getFqdn()); - assertEquals(TEST_PROVIDER_NAME, readWifiInfo.getProviderFriendlyName()); + assertEquals(TEST_FQDN, readWifiInfo.getPasspointFqdn()); + assertEquals(TEST_PROVIDER_NAME, readWifiInfo.getPasspointProviderFriendlyName()); } }