commit a12fb246ae9cb907f921fc1a5353c2c55d24e1c0
author Quang Luong <qal@google.com> Sun Jan 31 19:30:11 2021 -0800
committer Quang Luong <qal@google.com> Mon Feb 01 10:39:20 2021 -0800
tree dbfe5b962092d967cdfbe3ee37a02b14b714683a
parent 56ecbbedcc36c95f581827b75d51cc9ec0f0b9f8

[WifiCoex] Fix race condition in cts test coex callback

Fix race condition in testListenOnCoexUnsafeChannels by waiting for
callback to run before unregistering the callback.

Bug: 177665950
Test: atest android.net.wifi.cts.WifiManagerTest
Change-Id: I194c5cd5f286810e2cc68da736051c444a247859

tests/tests/wifi/src/android/net/wifi/cts/WifiManagerTest.java

diff --git a/tests/tests/wifi/src/android/net/wifi/cts/WifiManagerTest.java b/tests/tests/wifi/src/android/net/wifi/cts/WifiManagerTest.java
index 4890c9b..8bec270 100644
--- a/tests/tests/wifi/src/android/net/wifi/cts/WifiManagerTest.java
+++ b/tests/tests/wifi/src/android/net/wifi/cts/WifiManagerTest.java
@@ -23,7 +23,6 @@
 import static android.net.wifi.WifiManager.COEX_RESTRICTION_WIFI_AWARE;
 import static android.net.wifi.WifiManager.COEX_RESTRICTION_WIFI_DIRECT;
 import static android.net.wifi.WifiScanner.WIFI_BAND_24_GHZ;
-import static android.net.wifi.WifiScanner.WIFI_BAND_5_GHZ;
 
 import static com.google.common.truth.Truth.assertWithMessage;
 
@@ -3613,7 +3612,7 @@
         public void onCoexUnsafeChannelsChanged() {
             synchronized (mCoexLock) {
                 mOnCoexUnsafeChannelChangedCount++;
-                mLock.notify();
+                mCoexLock.notify();
             }
         }
 
@@ -3695,29 +3694,29 @@
 
             synchronized (mLock) {
                 try {
+                    mWifiManager.setCoexUnsafeChannels(unsafeChannels, restrictions);
                     // Callback should be called if the default algorithm is disabled.
-                    mWifiManager.setCoexUnsafeChannels(unsafeChannels, restrictions);
+                    mLock.wait(TEST_WAIT_DURATION_MS);
                     mWifiManager.unregisterCoexCallback(callback);
-                    // Callback should not be called here since it was unregistered.
                     mWifiManager.setCoexUnsafeChannels(unsafeChannels, restrictions);
-                    // now wait for callback
+                    // Callback should not be called here since it was unregistered.
                     mLock.wait(TEST_WAIT_DURATION_MS);
                 } catch (InterruptedException e) {
                     fail("Thread interrupted unexpectedly while waiting on mLock");
                 }
             }
 
-            if (callback.mOnCoexUnsafeChannelChangedCount == 0) {
+            if (callback.getOnCoexUnsafeChannelChangedCount() == 0) {
                 // Default algorithm enabled, setter should have done nothing
                 assertEquals(prevUnsafeChannels, mWifiManager.getCoexUnsafeChannels());
                 assertEquals(prevRestrictions, mWifiManager.getCoexRestrictions());
-            } else if (callback.mOnCoexUnsafeChannelChangedCount == 1) {
+            } else if (callback.getOnCoexUnsafeChannelChangedCount() == 1) {
                 // Default algorithm disabled, setter should set the getter values.
                 assertEquals(unsafeChannels, mWifiManager.getCoexUnsafeChannels());
                 assertEquals(restrictions, mWifiManager.getCoexRestrictions());
             } else {
                 fail("Coex callback called " + callback.mOnCoexUnsafeChannelChangedCount
-                        + " times. Expected 1 call." );
+                        + " times. Expected 0 or 1 calls." );
             }
         } finally {
             // Reset the previous unsafe channels if we overrode them.