Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Added Passpoint prefix to Passpoint related methods in WifiInfo"

Browse Source
This commit is contained in:
Quang Luong
2019-03-12 02:29:06 +00:00
committed by Android (Google) Code Review
parent 03fdf35208 2a6cdc554e
commit 1fc84caa29
6 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -29945,6 +29945,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();

2
api/system-current.txt
View File

@@ -4734,8 +4734,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();
}

2
packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
View File

@@ -1076,7 +1076,7 @@ public class AccessPoint implements Comparable<AccessPoint> {
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) {

2
packages/SettingsLib/src/com/android/settingslib/wifi/WifiStatusTracker.java
View File

@@ -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);
}

14
wifi/java/android/net/wifi/WifiInfo.java
View File

@@ -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;
}

4
wifi/tests/src/android/net/wifi/WifiInfoTest.java
View File

@@ -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());
}
}