Snap for 4722539 from 14f29eae899621893fdb9051e52522386a510f49 to pi-release
Change-Id: I5dc42ef15b4865d99aa5f98086d8a59ae0965cad
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 c9b82ee..8a22bef 100644
--- a/tests/cts/net/src/android/net/wifi/cts/ScanResultTest.java
+++ b/tests/cts/net/src/android/net/wifi/cts/ScanResultTest.java
@@ -42,12 +42,14 @@
private static final int STATE_WIFI_CHANGED = 2;
private static final int STATE_START_SCAN = 3;
private static final int STATE_SCAN_RESULTS_AVAILABLE = 4;
+ private static final int STATE_SCAN_FAILURE = 5;
private static final String TAG = "WifiInfoTest";
private static final int TIMEOUT_MSEC = 6000;
private static final int WAIT_MSEC = 60;
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 IntentFilter mIntentFilter;
private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
@Override
@@ -60,7 +62,11 @@
}
} else if (action.equals(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION)) {
synchronized (mMySync) {
- mMySync.expectedState = STATE_SCAN_RESULTS_AVAILABLE;
+ if (intent.getBooleanExtra(WifiManager.EXTRA_RESULTS_UPDATED, false)) {
+ mMySync.expectedState = STATE_SCAN_RESULTS_AVAILABLE;
+ } else {
+ mMySync.expectedState = STATE_SCAN_FAILURE;
+ }
mMySync.notify();
}
}
@@ -120,11 +126,12 @@
}
}
- private void waitForBroadcast(long timeout, int expectedState) throws Exception {
+ private boolean waitForBroadcast(long timeout, int expectedState) throws Exception {
long waitTime = System.currentTimeMillis() + timeout;
while (System.currentTimeMillis() < waitTime
&& mMySync.expectedState != expectedState)
mMySync.wait(WAIT_MSEC);
+ return mMySync.expectedState == expectedState;
}
public void testScanResultProperties() {
@@ -140,11 +147,16 @@
}
}
+ /* Multiple scans to ensure bssid is updated */
private void scanAndWait() throws Exception {
synchronized (mMySync) {
- mMySync.expectedState = STATE_START_SCAN;
- mWifiManager.startScan();
- waitForBroadcast(SCAN_WAIT_MSEC, STATE_SCAN_RESULTS_AVAILABLE);
+ for (int retry = 0; retry < SCAN_MAX_RETRY_COUNT; retry++) {
+ mMySync.expectedState = STATE_START_SCAN;
+ mWifiManager.startScan();
+ if (waitForBroadcast(SCAN_WAIT_MSEC, STATE_SCAN_RESULTS_AVAILABLE)) {
+ break;
+ }
+ }
}
}
@@ -157,9 +169,6 @@
long timestamp = 0;
String BSSID = null;
- /* Multiple scans to ensure bssid is updated */
- scanAndWait();
- scanAndWait();
scanAndWait();
List<ScanResult> scanResults = mWifiManager.getScanResults();
@@ -171,8 +180,6 @@
}
scanAndWait();
- scanAndWait();
- scanAndWait();
scanResults = mWifiManager.getScanResults();
for (ScanResult result : scanResults) {
diff --git a/tests/cts/net/src/android/net/wifi/rtt/cts/WifiRttTest.java b/tests/cts/net/src/android/net/wifi/rtt/cts/WifiRttTest.java
index 5e8ae16..8c59a57 100644
--- a/tests/cts/net/src/android/net/wifi/rtt/cts/WifiRttTest.java
+++ b/tests/cts/net/src/android/net/wifi/rtt/cts/WifiRttTest.java
@@ -84,6 +84,11 @@
int[] distanceMms = new int[NUM_OF_RTT_ITERATIONS];
int[] distanceStdDevMms = new int[NUM_OF_RTT_ITERATIONS];
int[] rssis = new int[NUM_OF_RTT_ITERATIONS];
+ int[] numAttempted = new int[NUM_OF_RTT_ITERATIONS];
+ int[] numSuccessful = new int[NUM_OF_RTT_ITERATIONS];
+ long[] timestampsMs = new long[NUM_OF_RTT_ITERATIONS];
+ byte[] lastLci = null;
+ byte[] lastLcr = null;
for (int i = 0; i < NUM_OF_RTT_ITERATIONS; ++i) {
ResultCallback callback = new ResultCallback();
mWifiRttManager.startRanging(request, mExecutor, callback);
@@ -98,6 +103,9 @@
RangingResult result = currentResults.get(0);
assertTrue("Wi-Fi RTT results: invalid result (wrong BSSID) entry on iteration " + i,
result.getMacAddress().toString().equals(testAp.BSSID));
+ assertEquals(
+ "Wi-Fi RTT results: invalid result (non-null PeerHandle) entry on iteration "
+ + i, null, result.getPeerHandle());
allResults.add(result);
int status = result.getStatus();
@@ -118,6 +126,20 @@
distanceMms[i - numFailures] = result.getDistanceMm();
distanceStdDevMms[i - numFailures] = result.getDistanceStdDevMm();
rssis[i - numFailures] = result.getRssi();
+ numAttempted[i - numFailures] = result.getNumAttemptedMeasurements();
+ numSuccessful[i - numFailures] = result.getNumSuccessfulMeasurements();
+ timestampsMs[i - numFailures] = result.getRangingTimestampMillis();
+
+ byte[] currentLci = result.getLci();
+ byte[] currentLcr = result.getLcr();
+ if (i - numFailures > 0) {
+ assertTrue("Wi-Fi RTT results: invalid result (LCI mismatch) on iteration " + i,
+ Arrays.equals(currentLci, lastLci));
+ assertTrue("Wi-Fi RTT results: invalid result (LCR mismatch) on iteration " + i,
+ Arrays.equals(currentLcr, lastLcr));
+ }
+ lastLci = currentLci;
+ lastLcr = currentLcr;
} else {
numFailures++;
}
@@ -133,6 +155,12 @@
ResultType.NEUTRAL, ResultUnit.NONE);
reportLog.addValues("rssi_dbm", Arrays.copyOf(rssis, numGoodResults), ResultType.NEUTRAL,
ResultUnit.NONE);
+ reportLog.addValues("num_attempted", Arrays.copyOf(numAttempted, numGoodResults),
+ ResultType.NEUTRAL, ResultUnit.NONE);
+ reportLog.addValues("num_successful", Arrays.copyOf(numSuccessful, numGoodResults),
+ ResultType.NEUTRAL, ResultUnit.NONE);
+ reportLog.addValues("timestamps", Arrays.copyOf(timestampsMs, numGoodResults),
+ ResultType.NEUTRAL, ResultUnit.NONE);
reportLog.submit();
// Analyze results
@@ -156,13 +184,21 @@
return;
}
+ ScanResult dummy = new ScanResult();
+ dummy.BSSID = "00:01:02:03:04:05";
+
RangingRequest.Builder builder = new RangingRequest.Builder();
- for (int i = 0; i < RangingRequest.getMaxPeers() + 1; ++i) {
- ScanResult dummy = new ScanResult();
- dummy.BSSID = "00:01:02:03:04:05";
+ for (int i = 0; i < RangingRequest.getMaxPeers() - 2; ++i) {
builder.addAccessPoint(dummy);
}
+ List<ScanResult> scanResults = new ArrayList<>();
+ scanResults.add(dummy);
+ scanResults.add(dummy);
+ scanResults.add(dummy);
+
+ builder.addAccessPoints(scanResults);
+
try {
mWifiRttManager.startRanging(builder.build(), mExecutor, new ResultCallback());
} catch (IllegalArgumentException e) {