From e5436af58ca25daef3f22d707346fb368238e69c Mon Sep 17 00:00:00 2001 From: lesl Date: Sat, 19 Dec 2020 23:53:59 +0800 Subject: [PATCH] wifi: Add callback onConnectedClientsOrInfoChanged handling Now service will only send onConnectedClientsOrInfoChanged to Manager side. Add callback handling to dispatch correct callback base on below scenarios. 1. onInfoChanged(SoftApInfo) will send when a. registration (non bridged) b. non bridged and info changed 2. onInfoChanged(List) will send when a. registration b. info changed 3. onConnectedClientsChanged(List) will send a. registration b. clients changed 4. onConnectedClientsChanged(SoftApInfo, List) will send a. when registration and client connected b. client changed on specific instance. It will also need to handle when info changed(dismisssed), it means that an instance shutdown. It needs to send empty list if previous instance has client connected. AP+AP Part 6 includes: Support dual SoftApInfo callback a. New callback onInfoChanged(List) & onConnectedClientsChanged(SoftApInfo, List) b. Callback refactoring c. Support shutdown idle instance in bridged mode Bug: 162686273 Bug: 175351193 Test: FrameworksWifiApiTests Test: Manual Test, check the log and check SystemUI to confirm clients update correctly. Change-Id: Id587125edbb1167f58bba6b50a708be12888490f --- wifi/java/android/net/wifi/WifiManager.java | 80 +++- .../src/android/net/wifi/WifiManagerTest.java | 352 +++++++++++++++--- 2 files changed, 373 insertions(+), 59 deletions(-) diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index b5baee5b42a6e..d7fcd54c9534f 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -4039,7 +4039,7 @@ public class WifiManager { * Note: this API is only valid when the Soft AP is configured as a single AP * - not as a bridged AP (2 Soft APs). When the Soft AP is configured as bridged AP * this callback will not be triggered - use the - * {@link #onInfoListChanged(List)} callback in bridged AP mode. + * {@link #onInfoChanged(List)} callback in bridged AP mode. * * @param softApInfo is the softap information. {@link SoftApInfo} */ @@ -4105,6 +4105,7 @@ public class WifiManager { private final Executor mExecutor; private final SoftApCallback mCallback; private Map> mCurrentClients = new HashMap<>(); + private Map mCurrentInfos = new HashMap<>(); private List getConnectedClientList(Map> clientsMap) { List connectedClientList = new ArrayList<>(); @@ -4132,22 +4133,81 @@ public class WifiManager { }); } - // TODO: b/175351193, integrate callbacks to simplify the logic. @Override public void onConnectedClientsOrInfoChanged(Map infos, Map> clients, boolean isBridged, boolean isRegistration) { if (mVerboseLoggingEnabled) { - Log.v(TAG, "SoftApCallbackProxy: onConnectedClientsChanged: clients=" - + clients + " infos" + infos + "isBridged is " + isBridged - + "isRegistration is " + isRegistration); + Log.v(TAG, "SoftApCallbackProxy: onConnectedClientsOrInfoChanged: clients: " + + clients + ", infos: " + infos + ", isBridged is " + isBridged + + ", isRegistration is " + isRegistration); + } + + List changedInfoList = new ArrayList<>(infos.values()); + Map> changedInfoClients = new HashMap<>(); + boolean isInfoChanged = infos.size() != mCurrentInfos.size(); + for (SoftApInfo info : mCurrentInfos.values()) { + String changedInstance = info.getApInstanceIdentifier(); + if (!changedInfoList.contains(info)) { + isInfoChanged = true; + if (mCurrentClients.getOrDefault(changedInstance, + Collections.emptyList()).size() > 0) { + Log.d(TAG, "SoftApCallbackProxy: info changed on client connected" + + " instance(Shut Down case)"); + //Here should notify client changed on old info + changedInfoClients.put(info, Collections.emptyList()); + } + } else { + // info doesn't change, check client list + List changedClientList = clients.getOrDefault( + changedInstance, Collections.emptyList()); + if (changedClientList.size() + != mCurrentClients + .getOrDefault(changedInstance, Collections.emptyList()).size()) { + // Here should notify client changed on new info(same as old info) + changedInfoClients.put(info, changedClientList); + Log.d(TAG, "SoftApCallbackProxy: client changed on " + info + + " list: " + changedClientList); + } + } + } + + if (!isInfoChanged && changedInfoClients.isEmpty() + && !isRegistration) { + Log.v(TAG, "SoftApCallbackProxy: No changed & Not Registration," + + " don't need to notify the client"); + return; } - // TODO: b/175351193 Now handle onConnectedClientsChanged in single AP mode first - boolean shouldSendOnConnectedClientsChanged = isRegistration - || (getConnectedClientList(mCurrentClients).size() - != getConnectedClientList(clients).size()); mCurrentClients = clients; + mCurrentInfos = infos; Binder.clearCallingIdentity(); - if (shouldSendOnConnectedClientsChanged) { + // Notify the clients changed first for old info shutdown case + for (SoftApInfo changedInfo : changedInfoClients.keySet()) { + Log.v(TAG, "send onConnectedClientsChanged, changedInfo is " + changedInfo); + mExecutor.execute(() -> { + mCallback.onConnectedClientsChanged( + changedInfo, changedInfoClients.get(changedInfo)); + }); + } + + if (isInfoChanged || isRegistration) { + if (!isBridged) { + SoftApInfo newInfo = changedInfoList.isEmpty() + ? new SoftApInfo() : changedInfoList.get(0); + Log.v(TAG, "SoftApCallbackProxy: send InfoChanged, newInfo: " + newInfo); + mExecutor.execute(() -> { + mCallback.onInfoChanged(newInfo); + }); + } + Log.v(TAG, "SoftApCallbackProxy: send InfoChanged, changedInfoList: " + + changedInfoList); + mExecutor.execute(() -> { + mCallback.onInfoChanged(changedInfoList); + }); + } + + if (isRegistration || !changedInfoClients.isEmpty()) { + Log.v(TAG, "SoftApCallbackProxy: send onConnectedClientsChanged(clients): " + + getConnectedClientList(clients)); mExecutor.execute(() -> { mCallback.onConnectedClientsChanged(getConnectedClientList(clients)); }); diff --git a/wifi/tests/src/android/net/wifi/WifiManagerTest.java b/wifi/tests/src/android/net/wifi/WifiManagerTest.java index fe383b6c11969..274cff2f41e80 100644 --- a/wifi/tests/src/android/net/wifi/WifiManagerTest.java +++ b/wifi/tests/src/android/net/wifi/WifiManagerTest.java @@ -67,6 +67,7 @@ import static org.mockito.Mockito.eq; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; +import static org.mockito.Mockito.reset; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; @@ -110,6 +111,7 @@ import org.junit.Test; import org.mockito.ArgumentCaptor; import org.mockito.InOrder; import org.mockito.Mock; +import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import java.util.ArrayList; @@ -135,10 +137,18 @@ public class WifiManagerTest { private static final String TEST_FEATURE_ID = "TestFeature"; private static final String TEST_COUNTRY_CODE = "US"; private static final String[] TEST_MAC_ADDRESSES = {"da:a1:19:0:0:0"}; - private static final int TEST_AP_FREQUENCY = 2412; - private static final int TEST_AP_BANDWIDTH = SoftApInfo.CHANNEL_WIDTH_20MHZ; private static final int TEST_SUB_ID = 3; - private static final String TEST_AP_INSTANCE = "wlan1"; + private static final String[] TEST_AP_INSTANCES = new String[] {"wlan1", "wlan2"}; + private static final int[] TEST_AP_FREQS = new int[] {2412, 5220}; + private static final int[] TEST_AP_BWS = new int[] {SoftApInfo.CHANNEL_WIDTH_20MHZ_NOHT, + SoftApInfo.CHANNEL_WIDTH_80MHZ}; + private static final MacAddress[] TEST_AP_BSSIDS = new MacAddress[] { + MacAddress.fromString("22:33:44:55:66:77"), + MacAddress.fromString("aa:bb:cc:dd:ee:ff")}; + private static final MacAddress[] TEST_AP_CLIENTS = new MacAddress[] { + MacAddress.fromString("22:33:44:aa:aa:77"), + MacAddress.fromString("aa:bb:cc:11:11:ff"), + MacAddress.fromString("22:bb:cc:11:aa:ff")}; @Mock Context mContext; @Mock android.net.wifi.IWifiManager mWifiService; @@ -165,6 +175,11 @@ public class WifiManagerTest { private CoexCallback mCoexCallback; private WifiActivityEnergyInfo mWifiActivityEnergyInfo; + private HashMap mTestSoftApInfoMap = new HashMap<>(); + private HashMap> mTestWifiClientsMap = new HashMap<>(); + private SoftApInfo mTestApInfo1 = new SoftApInfo(); + private SoftApInfo mTestApInfo2 = new SoftApInfo(); + /** * Util function to check public field which used for softap in WifiConfiguration * same as the value in SoftApConfiguration. @@ -209,6 +224,31 @@ public class WifiManagerTest { .build(); } + private void initTestInfoAndAddToTestMap(int numberOfInfos) { + if (numberOfInfos > 2) return; + for (int i = 0; i < numberOfInfos; i++) { + SoftApInfo info = mTestApInfo1; + if (i == 1) info = mTestApInfo2; + info.setFrequency(TEST_AP_FREQS[i]); + info.setBandwidth(TEST_AP_BWS[i]); + info.setBssid(TEST_AP_BSSIDS[i]); + info.setApInstanceIdentifier(TEST_AP_INSTANCES[i]); + mTestSoftApInfoMap.put(TEST_AP_INSTANCES[i], info); + } + } + + private List initWifiClientAndAddToTestMap(String targetInstance, + int numberOfClients, int startIdx) { + if (numberOfClients > 3) return null; + List clients = new ArrayList<>(); + for (int i = startIdx; i < startIdx + numberOfClients; i++) { + WifiClient client = new WifiClient(TEST_AP_CLIENTS[i], targetInstance); + clients.add(client); + } + mTestWifiClientsMap.put(targetInstance, clients); + return clients; + } + @Before public void setUp() throws Exception { MockitoAnnotations.initMocks(this); @@ -233,6 +273,8 @@ public class WifiManagerTest { } }; mWifiActivityEnergyInfo = new WifiActivityEnergyInfo(0, 0, 0, 0, 0, 0); + mTestSoftApInfoMap.clear(); + mTestWifiClientsMap.clear(); } /** @@ -1087,14 +1129,149 @@ public class WifiManagerTest { mWifiManager.registerSoftApCallback(new HandlerExecutor(mHandler), mSoftApCallback); verify(mWifiService).registerSoftApCallback(any(IBinder.class), callbackCaptor.capture(), anyInt()); - - // TODO: 175351193 - /* - final List testClients = new ArrayList(); - callbackCaptor.getValue().onConnectedClientsChanged(testClients); + List clientList; + // Verify the register callback in disable state. + callbackCaptor.getValue().onConnectedClientsOrInfoChanged( + (Map) mTestSoftApInfoMap.clone(), + (Map>) mTestWifiClientsMap.clone(), false, true); mLooper.dispatchAll(); - verify(mSoftApCallback).onConnectedClientsChanged(testClients); - */ + verify(mSoftApCallback).onConnectedClientsChanged(new ArrayList()); + verify(mSoftApCallback, never()).onConnectedClientsChanged(any(), any()); + verify(mSoftApCallback).onInfoChanged(new SoftApInfo()); + verify(mSoftApCallback).onInfoChanged(new ArrayList()); + // After verify, reset mSoftApCallback for nex test + reset(mSoftApCallback); + + // Single AP mode Test + // Test info update + initTestInfoAndAddToTestMap(1); + callbackCaptor.getValue().onConnectedClientsOrInfoChanged( + (Map) mTestSoftApInfoMap.clone(), + (Map>) mTestWifiClientsMap.clone(), false, false); + mLooper.dispatchAll(); + verify(mSoftApCallback).onInfoChanged(mTestApInfo1); + verify(mSoftApCallback).onInfoChanged(Mockito.argThat((List infos) -> + infos.contains(mTestApInfo1))); + verify(mSoftApCallback, never()).onConnectedClientsChanged(any()); + verify(mSoftApCallback, never()).onConnectedClientsChanged(any(), any()); + // After verify, reset mSoftApCallback for nex test + reset(mSoftApCallback); + + // Test first client connected + clientList = initWifiClientAndAddToTestMap(TEST_AP_INSTANCES[0], 1, 0); + callbackCaptor.getValue().onConnectedClientsOrInfoChanged( + (Map) mTestSoftApInfoMap.clone(), + (Map>) mTestWifiClientsMap.clone(), false, false); + mLooper.dispatchAll(); + // checked NO any infoChanged, includes InfoChanged(SoftApInfo) + // and InfoChanged(List) + verify(mSoftApCallback, never()).onInfoChanged(any(SoftApInfo.class)); + verify(mSoftApCallback, never()).onInfoChanged(any(List.class)); + verify(mSoftApCallback).onConnectedClientsChanged(mTestApInfo1, clientList); + verify(mSoftApCallback).onConnectedClientsChanged(clientList); + // After verify, reset mSoftApCallback for nex test + reset(mSoftApCallback); + + // Test second client connected + mTestWifiClientsMap.clear(); + clientList = initWifiClientAndAddToTestMap(TEST_AP_INSTANCES[0], 2, 0); + callbackCaptor.getValue().onConnectedClientsOrInfoChanged( + (Map) mTestSoftApInfoMap.clone(), + (Map>) mTestWifiClientsMap.clone(), false, false); + mLooper.dispatchAll(); + // checked NO any infoChanged, includes InfoChanged(SoftApInfo) + // and InfoChanged(List) + verify(mSoftApCallback, never()).onInfoChanged(any(SoftApInfo.class)); + verify(mSoftApCallback, never()).onInfoChanged(any(List.class)); + verify(mSoftApCallback).onConnectedClientsChanged(mTestApInfo1, clientList); + verify(mSoftApCallback).onConnectedClientsChanged(clientList); + // After verify, reset mSoftApCallback for nex test + reset(mSoftApCallback); + + // Test second client disconnect + mTestWifiClientsMap.clear(); + clientList = initWifiClientAndAddToTestMap(TEST_AP_INSTANCES[0], 1, 0); + callbackCaptor.getValue().onConnectedClientsOrInfoChanged( + (Map) mTestSoftApInfoMap.clone(), + (Map>) mTestWifiClientsMap.clone(), false, false); + mLooper.dispatchAll(); + // checked NO any infoChanged, includes InfoChanged(SoftApInfo) + // and InfoChanged(List) + verify(mSoftApCallback, never()).onInfoChanged(any(SoftApInfo.class)); + verify(mSoftApCallback, never()).onInfoChanged(any(List.class)); + verify(mSoftApCallback).onConnectedClientsChanged(mTestApInfo1, clientList); + verify(mSoftApCallback).onConnectedClientsChanged(clientList); + // After verify, reset mSoftApCallback for nex test + reset(mSoftApCallback); + + // Test bridged mode case + mTestSoftApInfoMap.clear(); + initTestInfoAndAddToTestMap(2); + callbackCaptor.getValue().onConnectedClientsOrInfoChanged( + (Map) mTestSoftApInfoMap.clone(), + (Map>) mTestWifiClientsMap.clone(), true, false); + mLooper.dispatchAll(); + verify(mSoftApCallback, never()).onInfoChanged(any(SoftApInfo.class)); + verify(mSoftApCallback).onInfoChanged(Mockito.argThat((List infos) -> + infos.contains(mTestApInfo1) && infos.contains(mTestApInfo2) + )); + verify(mSoftApCallback, never()).onConnectedClientsChanged(any()); + verify(mSoftApCallback, never()).onConnectedClientsChanged(any(), any()); + // After verify, reset mSoftApCallback for nex test + reset(mSoftApCallback); + + // Test client connect to second instance + List clientListOnSecond = + initWifiClientAndAddToTestMap(TEST_AP_INSTANCES[1], 1, 2); // client3 to wlan2 + List totalList = new ArrayList<>(); + totalList.addAll(clientList); + totalList.addAll(clientListOnSecond); + callbackCaptor.getValue().onConnectedClientsOrInfoChanged( + (Map) mTestSoftApInfoMap.clone(), + (Map>) mTestWifiClientsMap.clone(), true, false); + mLooper.dispatchAll(); + // checked NO any infoChanged, includes InfoChanged(SoftApInfo) + // and InfoChanged(List) + verify(mSoftApCallback, never()).onInfoChanged(any(SoftApInfo.class)); + verify(mSoftApCallback, never()).onInfoChanged(any(List.class)); + verify(mSoftApCallback).onConnectedClientsChanged(mTestApInfo2, clientListOnSecond); + verify(mSoftApCallback).onConnectedClientsChanged(totalList); + // After verify, reset mSoftApCallback for nex test + reset(mSoftApCallback); + + // Test shutdown on second instance + mTestSoftApInfoMap.clear(); + mTestWifiClientsMap.clear(); + initTestInfoAndAddToTestMap(1); + clientList = initWifiClientAndAddToTestMap(TEST_AP_INSTANCES[0], 1, 0); + callbackCaptor.getValue().onConnectedClientsOrInfoChanged( + (Map) mTestSoftApInfoMap.clone(), + (Map>) mTestWifiClientsMap.clone(), true, false); + mLooper.dispatchAll(); + verify(mSoftApCallback, never()).onInfoChanged(any(SoftApInfo.class)); + verify(mSoftApCallback).onInfoChanged(Mockito.argThat((List infos) -> + infos.contains(mTestApInfo1))); + // second instance have client connected before, thus it should send empty list + verify(mSoftApCallback).onConnectedClientsChanged( + mTestApInfo2, new ArrayList()); + verify(mSoftApCallback).onConnectedClientsChanged(clientList); + // After verify, reset mSoftApCallback for nex test + reset(mSoftApCallback); + + // Test bridged mode disable when client connected + mTestSoftApInfoMap.clear(); + mTestWifiClientsMap.clear(); + callbackCaptor.getValue().onConnectedClientsOrInfoChanged( + (Map) mTestSoftApInfoMap.clone(), + (Map>) mTestWifiClientsMap.clone(), true, false); + mLooper.dispatchAll(); + verify(mSoftApCallback, never()).onInfoChanged(any(SoftApInfo.class)); + verify(mSoftApCallback).onInfoChanged(new ArrayList()); + verify(mSoftApCallback).onConnectedClientsChanged(new ArrayList()); + verify(mSoftApCallback).onConnectedClientsChanged( + mTestApInfo1, new ArrayList()); + // After verify, reset mSoftApCallback for nex test + reset(mSoftApCallback); } @@ -1103,45 +1280,139 @@ public class WifiManagerTest { */ @Test public void softApCallbackProxyCallsOnSoftApInfoChanged() throws Exception { - SoftApInfo testSoftApInfo = new SoftApInfo(); - testSoftApInfo.setFrequency(TEST_AP_FREQUENCY); - testSoftApInfo.setBandwidth(TEST_AP_BANDWIDTH); ArgumentCaptor callbackCaptor = ArgumentCaptor.forClass(ISoftApCallback.Stub.class); mWifiManager.registerSoftApCallback(new HandlerExecutor(mHandler), mSoftApCallback); verify(mWifiService).registerSoftApCallback(any(IBinder.class), callbackCaptor.capture(), anyInt()); - // TODO: 175351193 - /* - callbackCaptor.getValue().onInfoChanged(testSoftApInfo); + // Verify the register callback in disable state. + callbackCaptor.getValue().onConnectedClientsOrInfoChanged( + (Map) mTestSoftApInfoMap.clone(), + (Map>) mTestWifiClientsMap.clone(), false, true); mLooper.dispatchAll(); - verify(mSoftApCallback).onInfoChanged(testSoftApInfo); - */ + verify(mSoftApCallback).onConnectedClientsChanged(new ArrayList()); + verify(mSoftApCallback, never()).onConnectedClientsChanged(any(), any()); + verify(mSoftApCallback).onInfoChanged(new SoftApInfo()); + verify(mSoftApCallback).onInfoChanged(new ArrayList()); + // After verify, reset mSoftApCallback for nex test + reset(mSoftApCallback); + + // Single AP mode Test + // Test info update + initTestInfoAndAddToTestMap(1); + callbackCaptor.getValue().onConnectedClientsOrInfoChanged( + (Map) mTestSoftApInfoMap.clone(), + (Map>) mTestWifiClientsMap.clone(), false, false); + mLooper.dispatchAll(); + verify(mSoftApCallback).onInfoChanged(mTestApInfo1); + verify(mSoftApCallback).onInfoChanged(Mockito.argThat((List infos) -> + infos.contains(mTestApInfo1))); + verify(mSoftApCallback, never()).onConnectedClientsChanged(any()); + verify(mSoftApCallback, never()).onConnectedClientsChanged(any(), any()); + // After verify, reset mSoftApCallback for nex test + reset(mSoftApCallback); + + // Test info changed + SoftApInfo changedInfo = new SoftApInfo(mTestSoftApInfoMap.get(TEST_AP_INSTANCES[0])); + changedInfo.setFrequency(2422); + mTestSoftApInfoMap.put(TEST_AP_INSTANCES[0], changedInfo); + callbackCaptor.getValue().onConnectedClientsOrInfoChanged( + (Map) mTestSoftApInfoMap.clone(), + (Map>) mTestWifiClientsMap.clone(), false, false); + mLooper.dispatchAll(); + verify(mSoftApCallback).onInfoChanged(changedInfo); + verify(mSoftApCallback).onInfoChanged(Mockito.argThat((List infos) -> + infos.contains(changedInfo))); + verify(mSoftApCallback, never()).onConnectedClientsChanged(any()); + verify(mSoftApCallback, never()).onConnectedClientsChanged(any(), any()); + + // Test Stop, all of infos is empty + mTestSoftApInfoMap.clear(); + callbackCaptor.getValue().onConnectedClientsOrInfoChanged( + (Map) mTestSoftApInfoMap.clone(), + (Map>) mTestWifiClientsMap.clone(), false, false); + mLooper.dispatchAll(); + verify(mSoftApCallback).onInfoChanged(new SoftApInfo()); + verify(mSoftApCallback).onInfoChanged(new ArrayList()); + verify(mSoftApCallback, never()).onConnectedClientsChanged(any()); + verify(mSoftApCallback, never()).onConnectedClientsChanged(any(), any()); + // After verify, reset mSoftApCallback for nex test + reset(mSoftApCallback); } /* * Verify client-provided callback is being called through callback proxy */ @Test - public void softApCallbackProxyCallsOnSoftApInfoListChanged() throws Exception { - SoftApInfo testSoftApInfo = new SoftApInfo(); - testSoftApInfo.setFrequency(TEST_AP_FREQUENCY); - testSoftApInfo.setBandwidth(TEST_AP_BANDWIDTH); - List infoList = new ArrayList<>(); - infoList.add(testSoftApInfo); + public void softApCallbackProxyCallsOnSoftApInfoChangedInBridgedMode() throws Exception { ArgumentCaptor callbackCaptor = ArgumentCaptor.forClass(ISoftApCallback.Stub.class); mWifiManager.registerSoftApCallback(new HandlerExecutor(mHandler), mSoftApCallback); verify(mWifiService).registerSoftApCallback(any(IBinder.class), callbackCaptor.capture(), anyInt()); - // TODO: 175351193 - /* - callbackCaptor.getValue().onInfoListChanged(infoList); - mLooper.dispatchAll(); - verify(mSoftApCallback).onInfoListChanged(infoList); - */ - } + // Test bridged mode case + initTestInfoAndAddToTestMap(2); + callbackCaptor.getValue().onConnectedClientsOrInfoChanged( + (Map) mTestSoftApInfoMap.clone(), + (Map>) mTestWifiClientsMap.clone(), true, false); + mLooper.dispatchAll(); + verify(mSoftApCallback, never()).onInfoChanged(any(SoftApInfo.class)); + verify(mSoftApCallback).onInfoChanged(Mockito.argThat((List infos) -> + infos.contains(mTestApInfo1) && infos.contains(mTestApInfo2) + )); + verify(mSoftApCallback, never()).onConnectedClientsChanged(any()); + verify(mSoftApCallback, never()).onConnectedClientsChanged(any(), any()); + // After verify, reset mSoftApCallback for nex test + reset(mSoftApCallback); + + // Test bridged mode case but an info changed + SoftApInfo changedInfoBridgedMode = new SoftApInfo(mTestSoftApInfoMap.get( + TEST_AP_INSTANCES[0])); + changedInfoBridgedMode.setFrequency(2422); + mTestSoftApInfoMap.put(TEST_AP_INSTANCES[0], changedInfoBridgedMode); + callbackCaptor.getValue().onConnectedClientsOrInfoChanged( + (Map) mTestSoftApInfoMap.clone(), + (Map>) mTestWifiClientsMap.clone(), true, false); + mLooper.dispatchAll(); + verify(mSoftApCallback, never()).onInfoChanged(any(SoftApInfo.class)); + verify(mSoftApCallback).onInfoChanged(Mockito.argThat((List infos) -> + infos.contains(changedInfoBridgedMode) && infos.contains(mTestApInfo2) + )); + verify(mSoftApCallback, never()).onConnectedClientsChanged(any()); + verify(mSoftApCallback, never()).onConnectedClientsChanged(any(), any()); + // After verify, reset mSoftApCallback for nex test + reset(mSoftApCallback); + + // Test bridged mode case but an instance shutdown + mTestSoftApInfoMap.clear(); + initTestInfoAndAddToTestMap(1); + callbackCaptor.getValue().onConnectedClientsOrInfoChanged( + (Map) mTestSoftApInfoMap.clone(), + (Map>) mTestWifiClientsMap.clone(), true, false); + mLooper.dispatchAll(); + verify(mSoftApCallback, never()).onInfoChanged(any(SoftApInfo.class)); + verify(mSoftApCallback).onInfoChanged(Mockito.argThat((List infos) -> + infos.contains(mTestApInfo1) + )); + verify(mSoftApCallback, never()).onConnectedClientsChanged(any()); + verify(mSoftApCallback, never()).onConnectedClientsChanged(any(), any()); + // After verify, reset mSoftApCallback for nex test + reset(mSoftApCallback); + + // Test bridged mode disable case + mTestSoftApInfoMap.clear(); + callbackCaptor.getValue().onConnectedClientsOrInfoChanged( + (Map) mTestSoftApInfoMap.clone(), + (Map>) mTestWifiClientsMap.clone(), true, false); + mLooper.dispatchAll(); + verify(mSoftApCallback, never()).onInfoChanged(any(SoftApInfo.class)); + verify(mSoftApCallback).onInfoChanged(new ArrayList()); + verify(mSoftApCallback, never()).onConnectedClientsChanged(any()); + verify(mSoftApCallback, never()).onConnectedClientsChanged(any(), any()); + // After verify, reset mSoftApCallback for nex test + reset(mSoftApCallback); + } /* * Verify client-provided callback is being called through callback proxy @@ -1167,7 +1438,7 @@ public class WifiManagerTest { @Test public void softApCallbackProxyCallsOnBlockedClientConnecting() throws Exception { WifiClient testWifiClient = new WifiClient(MacAddress.fromString("22:33:44:55:66:77"), - TEST_AP_INSTANCE); + TEST_AP_INSTANCES[0]); ArgumentCaptor callbackCaptor = ArgumentCaptor.forClass(ISoftApCallback.Stub.class); mWifiManager.registerSoftApCallback(new HandlerExecutor(mHandler), mSoftApCallback); @@ -1186,11 +1457,6 @@ public class WifiManagerTest { */ @Test public void softApCallbackProxyCallsOnMultipleUpdates() throws Exception { - SoftApInfo testSoftApInfo = new SoftApInfo(); - testSoftApInfo.setFrequency(TEST_AP_FREQUENCY); - testSoftApInfo.setBandwidth(TEST_AP_BANDWIDTH); - List infoList = new ArrayList<>(); - infoList.add(testSoftApInfo); SoftApCapability testSoftApCapability = new SoftApCapability(0); testSoftApCapability.setMaxSupportedClients(10); ArgumentCaptor callbackCaptor = @@ -1201,24 +1467,12 @@ public class WifiManagerTest { final List testClients = new ArrayList(); callbackCaptor.getValue().onStateChanged(WIFI_AP_STATE_ENABLING, 0); - // TODO: 175351193 - /* - callbackCaptor.getValue().onConnectedClientsChanged(testClients); - callbackCaptor.getValue().onInfoChanged(testSoftApInfo); - callbackCaptor.getValue().onInfoListChanged(infoList); - */ callbackCaptor.getValue().onStateChanged(WIFI_AP_STATE_FAILED, SAP_START_FAILURE_GENERAL); callbackCaptor.getValue().onCapabilityChanged(testSoftApCapability); mLooper.dispatchAll(); verify(mSoftApCallback).onStateChanged(WIFI_AP_STATE_ENABLING, 0); - // TODO: 175351193 - /* - verify(mSoftApCallback).onConnectedClientsChanged(testClients); - verify(mSoftApCallback).onInfoChanged(testSoftApInfo); - verify(mSoftApCallback).onInfoListChanged(infoList); - */ verify(mSoftApCallback).onStateChanged(WIFI_AP_STATE_FAILED, SAP_START_FAILURE_GENERAL); verify(mSoftApCallback).onCapabilityChanged(testSoftApCapability); }