ScanRequestProxy: Ensure we use different listener instances

WifiScanner doesn't allow the usage of same listeners for multiple
scan requests.

Bug: 72452345
Test: Unit tests
Test: act.py -c wifi_manager.config -tb dut-name -tc WifiManagerTest
Change-Id: Ibcce74e3aea15f5854c2cfcd3d24bd1b34ee5a44

1 files changed, 23 insertions, 0 deletions

diff --git a/tests/wifitests/src/com/android/server/wifi/ScanRequestProxyTest.java b/tests/wifitests/src/com/android/server/wifi/ScanRequestProxyTest.java
index d64ef2370..759fbe27b 100644
--- a/tests/wifitests/src/com/android/server/wifi/ScanRequestProxyTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/ScanRequestProxyTest.java
@@ -425,6 +425,29 @@ public class ScanRequestProxyTest {
         verifyNoMoreInteractions(mWifiScanner, mWifiConfigManager, mContext);
     }
 
+    /**
+     * Verify that we don't use the same listener for multiple scan requests.
+     */
+    @Test
+    public void testSuccessiveScanRequestsDontUseSameListener() {
+        WifiScanner.ScanListener listener1;
+        WifiScanner.ScanListener listener2;
+        // Make scan request 1.
+        assertTrue(mScanRequestProxy.startScan(TEST_UID));
+        mInOrder.verify(mWifiScanner).startScan(any(), any(), any());
+        listener1 = mScanListenerArgumentCaptor.getValue();
+
+        // Make scan request 2.
+        assertTrue(mScanRequestProxy.startScan(TEST_UID));
+        // Ensure that we did send a second scan request to scanner.
+        mInOrder.verify(mWifiScanner).startScan(any(), any(), any());
+        listener2 = mScanListenerArgumentCaptor.getValue();
+
+        assertNotEquals(listener1, listener2);
+
+        verifyNoMoreInteractions(mWifiScanner, mWifiConfigManager, mContext);
+    }
+
     private void validateScanSettings(WifiScanner.ScanSettings scanSettings,
                                       boolean expectHiddenNetworks) {
         validateScanSettings(scanSettings, expectHiddenNetworks, false);