commit d8fd0f83956710595d336b65ccdbfc339d452ff6
author Jae Choon Jeon <jc.d.jeon@samsung.com> Wed Jan 22 15:04:45 2020 -0800
committer JAE CHOON JEON <jc.d.jeon@samsung.com> Tue Jan 28 17:25:48 2020 +0000
tree c4423f24607640c152b2d642015854242590d39e
parent 72a8efb9c0a65741fbe868fde62a594adc49e6ae

Change the location of WiFi Initialize() API within the same function

The testcase is failing for the model as there are no clients which have already invoked the initialize API.
So we changed the location of initialize() API little forward to be invoked before CTS test.

Bug: 148126151
Test: run cts --m CtsNetTestCases --t android.net.wifi.cts.ConcurrencyTest#testConcurrency

Change-Id: I1081d343795e07440ebf380c25f47c320c064556
Signed-off-by: Jae Choon Jeon <jc.d.jeon@samsung.com>
(cherry picked from commit 1a46560a2b55df0b3159884a7eed4b2598c2e827)

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

diff --git a/tests/cts/net/src/android/net/wifi/cts/ConcurrencyTest.java b/tests/cts/net/src/android/net/wifi/cts/ConcurrencyTest.java
index 628571c..c557338 100644
--- a/tests/cts/net/src/android/net/wifi/cts/ConcurrencyTest.java
+++ b/tests/cts/net/src/android/net/wifi/cts/ConcurrencyTest.java
@@ -272,6 +272,14 @@
                     + " needs Location enabled.");
         }
 
+        mWifiP2pManager =
+                (WifiP2pManager) getContext().getSystemService(Context.WIFI_P2P_SERVICE);
+        mWifiP2pChannel = mWifiP2pManager.initialize(
+                getContext(), getContext().getMainLooper(), null);
+
+        assertNotNull(mWifiP2pManager);
+        assertNotNull(mWifiP2pChannel);
+
         long timeout = System.currentTimeMillis() + TIMEOUT_MSEC;
         while (!mWifiManager.isWifiEnabled() && System.currentTimeMillis() < timeout) {
             try {
@@ -288,14 +296,6 @@
         assertEquals(WifiManager.WIFI_STATE_ENABLED, mMySync.expectedWifiState);
         assertEquals(WifiP2pManager.WIFI_P2P_STATE_ENABLED, mMySync.expectedP2pState);
 
-        mWifiP2pManager =
-                (WifiP2pManager) getContext().getSystemService(Context.WIFI_P2P_SERVICE);
-        mWifiP2pChannel = mWifiP2pManager.initialize(
-                getContext(), getContext().getMainLooper(), null);
-
-        assertNotNull(mWifiP2pManager);
-        assertNotNull(mWifiP2pChannel);
-
         assertTrue(waitForBroadcasts(MySync.NETWORK_INFO));
         // wait for changing to EnabledState
         assertNotNull(mMySync.expectedNetworkInfo);