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

Commit d9e13e79 authored by David Su's avatar David Su Committed by Android (Google) Code Review
Browse files

Merge changes from topic "scanreuslt-wifiinfo-systemapi" 

* changes:
  Expose ScanResult/WifiInfo @hide APIs as @SystemApi
  SettingsLib: convert raw fields to getters
  NetworkKey: migrate from ScanResult.wifiSsid to SSID
parents 474bf68c e955accd

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -30136,6 +30136,7 @@ package android.net.wifi { 
    field public static final int STATUS_SUGGESTION_CONNECTION_FAILURE_UNKNOWN = 0; // 0x0

    field @Deprecated public static final String SUPPLICANT_CONNECTION_CHANGE_ACTION = "android.net.wifi.supplicant.CONNECTION_CHANGE";

    field @Deprecated public static final String SUPPLICANT_STATE_CHANGED_ACTION = "android.net.wifi.supplicant.STATE_CHANGE";

    field public static final String UNKNOWN_SSID = "<unknown ssid>";

    field @Deprecated public static final int WIFI_MODE_FULL = 1; // 0x1

    field public static final int WIFI_MODE_FULL_HIGH_PERF = 3; // 0x3

    field public static final int WIFI_MODE_FULL_LOW_LATENCY = 4; // 0x4

api/system-current.txt

+10 −0
Original line number Diff line number Diff line
@@ -4855,8 +4855,18 @@ package android.net.wifi { 
  }















  public class WifiInfo implements android.os.Parcelable {













    method @Nullable public String getAppPackageName();













    method public double getRxSuccessRate();













    method public int getScore();













    method public double getTxBadRate();













    method public double getTxRetriesRate();













    method public double getTxSuccessRate();













    method public boolean isEphemeral();















    method public boolean isOsuAp();















    method public boolean isPasspointAp();













    method @Nullable public static String removeDoubleQuotes(@Nullable String);













    field public static final String DEFAULT_MAC_ADDRESS = "02:00:00:00:00:00";













    field public static final int INVALID_RSSI = -127; // 0xffffff81















  }





























  public class WifiManager {

































core/java/android/net/NetworkKey.java



+20
−17




























Original line number
Diff line number
Diff line








@@ -21,7 +21,7 @@ import android.annotation.Nullable;













import android.annotation.SystemApi;















import android.net.wifi.ScanResult;















import android.net.wifi.WifiInfo;













import android.net.wifi.WifiSsid;













import android.net.wifi.WifiManager;















import android.os.Parcel;















import android.os.Parcelable;















import android.text.TextUtils;










@@ -69,22 +69,25 @@ public class NetworkKey implements Parcelable {













     */















    @Nullable















    public static NetworkKey createFromScanResult(@Nullable ScanResult result) {













        if (result != null && result.wifiSsid != null) {













            final String ssid = result.wifiSsid.toString();













        if (result == null) {













            return null;













        }













        final String ssid = result.SSID;













        if (TextUtils.isEmpty(ssid) || ssid.equals(WifiManager.UNKNOWN_SSID)) {













            return null;













        }















        final String bssid = result.BSSID;













            if (!TextUtils.isEmpty(ssid) && !ssid.equals(WifiSsid.NONE)













                    && !TextUtils.isEmpty(bssid)) {













                WifiKey wifiKey;













        if (TextUtils.isEmpty(bssid)) {













            return null;













        }





























        try {













                    wifiKey = new WifiKey(String.format("\"%s\"", ssid), bssid);













            WifiKey wifiKey = new WifiKey(String.format("\"%s\"", ssid), bssid);













            return new NetworkKey(wifiKey);















        } catch (IllegalArgumentException e) {















            Log.e(TAG, "Unable to create WifiKey.", e);















            return null;















        }













                return new NetworkKey(wifiKey);













            }













        }













        return null;















    }































    /**









@@ -100,7 +103,7 @@ public class NetworkKey implements Parcelable {













        if (wifiInfo != null) {















            final String ssid = wifiInfo.getSSID();















            final String bssid = wifiInfo.getBSSID();













            if (!TextUtils.isEmpty(ssid) && !ssid.equals(WifiSsid.NONE)













            if (!TextUtils.isEmpty(ssid) && !ssid.equals(WifiManager.UNKNOWN_SSID)















                    && !TextUtils.isEmpty(bssid)) {















                WifiKey wifiKey;















                try {

































core/tests/coretests/src/android/net/NetworkKeyTest.java



+12
−12




























Original line number
Diff line number
Diff line








@@ -22,7 +22,7 @@ import static org.mockito.Mockito.when;





























import android.net.wifi.ScanResult;















import android.net.wifi.WifiInfo;













import android.net.wifi.WifiSsid;













import android.net.wifi.WifiManager;































import androidx.test.runner.AndroidJUnit4;


























@@ -65,7 +65,7 @@ public class NetworkKeyTest {





























    @Test















    public void createFromWifi_noneSsid() throws Exception {













        when(mWifiInfo.getSSID()).thenReturn(WifiSsid.NONE);













        when(mWifiInfo.getSSID()).thenReturn(WifiManager.UNKNOWN_SSID);















        when(mWifiInfo.getBSSID()).thenReturn(VALID_BSSID);















        assertNull(NetworkKey.createFromWifiInfo(mWifiInfo));















    }










@@ -106,7 +106,7 @@ public class NetworkKeyTest {













    }































    @Test













    public void createFromScanResult_nullWifiSsid() {













    public void createFromScanResult_nullSsid() {















        ScanResult scanResult = new ScanResult();















        scanResult.BSSID = VALID_BSSID;

























@@ -114,18 +114,18 @@ public class NetworkKeyTest {













    }































    @Test













    public void createFromScanResult_emptyWifiSsid() {













    public void createFromScanResult_emptySsid() {















        ScanResult scanResult = new ScanResult();













        scanResult.wifiSsid = WifiSsid.createFromAsciiEncoded("");













        scanResult.SSID = "";















        scanResult.BSSID = VALID_BSSID;































        assertNull(NetworkKey.createFromScanResult(scanResult));















    }































    @Test













    public void createFromScanResult_noneWifiSsid() {













    public void createFromScanResult_noneSsid() {















        ScanResult scanResult = new ScanResult();













        scanResult.wifiSsid = WifiSsid.createFromAsciiEncoded(WifiSsid.NONE);













        scanResult.SSID = WifiManager.UNKNOWN_SSID;















        scanResult.BSSID = VALID_BSSID;































        assertNull(NetworkKey.createFromScanResult(scanResult));









@@ -134,7 +134,7 @@ public class NetworkKeyTest {













    @Test















    public void createFromScanResult_nullBssid() {















        ScanResult scanResult = new ScanResult();













        scanResult.wifiSsid = WifiSsid.createFromAsciiEncoded(VALID_UNQUOTED_SSID);













        scanResult.SSID = VALID_UNQUOTED_SSID;































        assertNull(NetworkKey.createFromScanResult(scanResult));















    }









@@ -142,7 +142,7 @@ public class NetworkKeyTest {













    @Test















    public void createFromScanResult_emptyBssid() {















        ScanResult scanResult = new ScanResult();













        scanResult.wifiSsid = WifiSsid.createFromAsciiEncoded(VALID_UNQUOTED_SSID);













        scanResult.SSID = VALID_UNQUOTED_SSID;















        scanResult.BSSID = "";































        assertNull(NetworkKey.createFromScanResult(scanResult));









@@ -151,16 +151,16 @@ public class NetworkKeyTest {













    @Test















    public void createFromScanResult_invalidBssid() {















        ScanResult scanResult = new ScanResult();













        scanResult.wifiSsid = WifiSsid.createFromAsciiEncoded(VALID_UNQUOTED_SSID);













        scanResult.SSID = VALID_UNQUOTED_SSID;















        scanResult.BSSID = INVALID_BSSID;































        assertNull(NetworkKey.createFromScanResult(scanResult));















    }































    @Test













    public void createFromScanResult_validWifiSsid() {













    public void createFromScanResult_validSsid() {















        ScanResult scanResult = new ScanResult();













        scanResult.wifiSsid = WifiSsid.createFromAsciiEncoded(VALID_UNQUOTED_SSID);













        scanResult.SSID = VALID_UNQUOTED_SSID;















        scanResult.BSSID = VALID_BSSID;































        NetworkKey expected = new NetworkKey(new WifiKey(VALID_SSID, VALID_BSSID));

































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



+1
−1




























Original line number
Diff line number
Diff line








@@ -1066,7 +1066,7 @@ public class AccessPoint implements Comparable<AccessPoint> {













            } else {















                summary.append(getSummary(mContext, /* ssid */ null, getDetailedState(),















                        mInfo != null && mInfo.isEphemeral(),













                        mInfo != null ? mInfo.getNetworkSuggestionOrSpecifierPackageName() : null));













                        mInfo != null ? mInfo.getAppPackageName() : null));















            }















        } else { // not active















            if (mConfig != null && mConfig.hasNoInternetAccess()) {