Snap for 4751833 from 037b5d7d07bcbf3111418cf7d6e4ece9b9d35b22 to pi-release
Change-Id: Ia0f8db6d4e4e8310c7b6a2a30b159fba41bc1025
diff --git a/tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java b/tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java
index c435a8a..1a08d3d 100644
--- a/tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java
+++ b/tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java
@@ -70,7 +70,7 @@
private static final int STATE_WIFI_ENABLED = 2;
private static final int STATE_WIFI_DISABLED = 3;
private static final int STATE_SCANNING = 4;
- private static final int STATE_SCAN_RESULTS_AVAILABLE = 5;
+ private static final int STATE_SCAN_DONE = 5;
private static final String TAG = "WifiManagerTest";
private static final String SSID1 = "\"WifiManagerTest\"";
@@ -96,13 +96,15 @@
public void onReceive(Context context, Intent intent) {
final String action = intent.getAction();
if (action.equals(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION)) {
+
synchronized (mMySync) {
- if (mWifiManager.getScanResults() != null) {
+ if (intent.getBooleanExtra(WifiManager.EXTRA_RESULTS_UPDATED, false)) {
mScanResults = mWifiManager.getScanResults();
- mMySync.expectedState = STATE_SCAN_RESULTS_AVAILABLE;
- mScanResults = mWifiManager.getScanResults();
- mMySync.notifyAll();
+ } else {
+ mScanResults = null;
}
+ mMySync.expectedState = STATE_SCAN_DONE;
+ mMySync.notifyAll();
}
} else if (action.equals(WifiManager.WIFI_STATE_CHANGED_ACTION)) {
int newState = intent.getIntExtra(WifiManager.EXTRA_WIFI_STATE,