Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a6cdc55 authored by Quang Luong's avatar Quang Luong
Browse files

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
parent f554792c

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -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();

api/system-current.txt

+0 −2
Original line number Diff line number Diff line
@@ -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();















  }

































packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -1069,7 +1069,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) {

































packages/SettingsLib/src/com/android/settingslib/wifi/WifiStatusTracker.java



+1
−1




























Original line number
Diff line number
Diff line








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















                    }

































wifi/java/android/net/wifi/WifiInfo.java



+8
−6




























Original line number
Diff line number
Diff line








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















    }