LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Change the location of WiFi Initialize() API within the same function" am: 26d8f5808b

Browse Source 
Change-Id: I077641561f2c970e980d37a69fc248cd2d67f8ad
This commit is contained in:
Automerger Merge Worker
2020-01-31 16:31:36 +00:00
parent 26461e5ea8 26d8f5808b
commit 6e599930dd
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/cts/net/src/android/net/wifi/cts/ConcurrencyTest.java
View File

@@ -272,6 +272,14 @@ public class ConcurrencyTest extends AndroidTestCase {
+ " needs Location enabled."); + " 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; long timeout = System.currentTimeMillis() + TIMEOUT_MSEC;
while (!mWifiManager.isWifiEnabled() && System.currentTimeMillis() < timeout) { while (!mWifiManager.isWifiEnabled() && System.currentTimeMillis() < timeout) {
try { try {
@@ -288,14 +296,6 @@ public class ConcurrencyTest extends AndroidTestCase {
assertEquals(WifiManager.WIFI_STATE_ENABLED, mMySync.expectedWifiState); assertEquals(WifiManager.WIFI_STATE_ENABLED, mMySync.expectedWifiState);
assertEquals(WifiP2pManager.WIFI_P2P_STATE_ENABLED, mMySync.expectedP2pState); 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)); assertTrue(waitForBroadcasts(MySync.NETWORK_INFO));
// wait for changing to EnabledState // wait for changing to EnabledState
assertNotNull(mMySync.expectedNetworkInfo); assertNotNull(mMySync.expectedNetworkInfo);