[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"
am: 409c0dd705 -s ours
am skip reason: subject contains skip directive
Change-Id: I85a7864b8decff98e61982550d187229ee5ee7e4
diff --git a/tests/cts/net/Android.bp b/tests/cts/net/Android.bp
index b6ea4af..b00455d 100644
--- a/tests/cts/net/Android.bp
+++ b/tests/cts/net/Android.bp
@@ -60,6 +60,7 @@
"cts",
"vts",
"general-tests",
+ "mts",
],
}
diff --git a/tests/cts/net/native/dns/Android.bp b/tests/cts/net/native/dns/Android.bp
index 9fbc3fc..1704a2b 100644
--- a/tests/cts/net/native/dns/Android.bp
+++ b/tests/cts/net/native/dns/Android.bp
@@ -35,5 +35,6 @@
},
test_suites: [
"cts",
+ "mts",
],
-}
\ No newline at end of file
+}
diff --git a/tests/cts/net/src/android/net/wifi/cts/ScanResultTest.java b/tests/cts/net/src/android/net/wifi/cts/ScanResultTest.java
index ccf5fe2..9bd1226 100644
--- a/tests/cts/net/src/android/net/wifi/cts/ScanResultTest.java
+++ b/tests/cts/net/src/android/net/wifi/cts/ScanResultTest.java
@@ -23,6 +23,7 @@
import android.content.Intent;
import android.content.IntentFilter;
import android.net.wifi.ScanResult;
+import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
import android.net.wifi.WifiManager.WifiLock;
import android.platform.test.annotations.AppModeFull;
@@ -54,6 +55,8 @@
private static final int ENABLE_WAIT_MSEC = 10000;
private static final int SCAN_WAIT_MSEC = 10000;
private static final int SCAN_MAX_RETRY_COUNT = 6;
+ private static final int SCAN_FIND_BSSID_MAX_RETRY_COUNT = 5;
+ private static final long SCAN_FIND_BSSID_WAIT_MSEC = 5_000L;
private IntentFilter mIntentFilter;
private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
@Override
@@ -200,4 +203,31 @@
}
+ public void testScanResultMatchesWifiInfo() throws Exception {
+ if (!WifiFeature.isWifiSupported(getContext())) {
+ // skip the test if WiFi is not supported
+ return;
+ }
+
+ // This test case should run while connected to Wifi
+ final WifiInfo wifiInfo = mWifiManager.getConnectionInfo();
+ assertNotNull(wifiInfo);
+
+ ScanResult currentNetwork = null;
+ for (int i = 0; i < SCAN_FIND_BSSID_MAX_RETRY_COUNT; i++) {
+ scanAndWait();
+ final List<ScanResult> scanResults = mWifiManager.getScanResults();
+ currentNetwork = scanResults.stream().filter(r -> r.BSSID.equals(wifiInfo.getBSSID()))
+ .findAny().orElse(null);
+
+ if (currentNetwork != null) {
+ break;
+ }
+ Thread.sleep(SCAN_FIND_BSSID_WAIT_MSEC);
+ }
+ assertNotNull("Current network not found in scan results", currentNetwork);
+
+ assertEquals(wifiInfo.getWifiSsid(), currentNetwork.wifiSsid);
+ assertEquals(wifiInfo.getFrequency(), currentNetwork.frequency);
+ }
}
diff --git a/tests/cts/net/src/android/net/wifi/cts/WifiInfoTest.java b/tests/cts/net/src/android/net/wifi/cts/WifiInfoTest.java
index 5367722..9d9b2a3 100644
--- a/tests/cts/net/src/android/net/wifi/cts/WifiInfoTest.java
+++ b/tests/cts/net/src/android/net/wifi/cts/WifiInfoTest.java
@@ -139,8 +139,11 @@
}
wifiInfo.getBSSID();
+ wifiInfo.getFrequency();
wifiInfo.getIpAddress();
wifiInfo.getLinkSpeed();
+ wifiInfo.getPasspointFqdn();
+ wifiInfo.getPasspointProviderFriendlyName();
wifiInfo.getTxLinkSpeedMbps();
wifiInfo.getRxLinkSpeedMbps();
wifiInfo.getRssi();