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

Merge "[AWARE] Rename destroy() method to close()" into oc-dev

Browse Source
This commit is contained in:
Etan Cohen
2017-04-25 03:26:01 +00:00
committed by Android (Google) Code Review
parent 99ec4c0d91 2fa28c39ae
commit 6ae63d613c
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
tests/cts/net/src/android/net/wifi/aware/cts/SingleDeviceTest.java
View File

@@ -386,7 +386,7 @@ public class SingleDeviceTest extends AndroidTestCase {
synchronized (mLock) { synchronized (mLock) {
for (WifiAwareSession session : mSessions) { for (WifiAwareSession session : mSessions) {
// no damage from destroying twice (i.e. ok if test cleaned up after itself already) // no damage from destroying twice (i.e. ok if test cleaned up after itself already)
session.destroy(); session.close();
} }
mSessions.clear(); mSessions.clear();
} }
@@ -453,7 +453,7 @@ public class SingleDeviceTest extends AndroidTestCase {
} }
WifiAwareSession session = attachAndGetSession(); WifiAwareSession session = attachAndGetSession();
session.destroy(); session.close();
} }
/** /**
@@ -486,7 +486,7 @@ public class SingleDeviceTest extends AndroidTestCase {
byte[] mac = identityL.getMac(); byte[] mac = identityL.getMac();
assertNotNull("Wi-Fi Aware discovery MAC: iteration " + i, mac); assertNotNull("Wi-Fi Aware discovery MAC: iteration " + i, mac);
session.destroy(); session.close();
macs.add(new TestUtils.MacWrapper(mac)); macs.add(new TestUtils.MacWrapper(mac));
} }
@@ -527,14 +527,14 @@ public class SingleDeviceTest extends AndroidTestCase {
// 3. destroy // 3. destroy
assertFalse("Publish not terminated", discoveryCb.hasCallbackAlreadyHappened( assertFalse("Publish not terminated", discoveryCb.hasCallbackAlreadyHappened(
DiscoverySessionCallbackTest.ON_SESSION_TERMINATED)); DiscoverySessionCallbackTest.ON_SESSION_TERMINATED));
discoverySession.destroy(); discoverySession.close();
// 4. try update post-destroy: should time-out waiting for cb // 4. try update post-destroy: should time-out waiting for cb
discoverySession.updatePublish(publishConfig); discoverySession.updatePublish(publishConfig);
assertFalse("Publish update post destroy", discoveryCb.waitForCallback( assertFalse("Publish update post destroy", discoveryCb.waitForCallback(
DiscoverySessionCallbackTest.ON_SESSION_CONFIG_UPDATED)); DiscoverySessionCallbackTest.ON_SESSION_CONFIG_UPDATED));
session.destroy(); session.close();
} }
/** /**
@@ -574,7 +574,7 @@ public class SingleDeviceTest extends AndroidTestCase {
assertFalse("Publish update post terminate", discoveryCb.waitForCallback( assertFalse("Publish update post terminate", discoveryCb.waitForCallback(
DiscoverySessionCallbackTest.ON_SESSION_CONFIG_UPDATED)); DiscoverySessionCallbackTest.ON_SESSION_CONFIG_UPDATED));
session.destroy(); session.close();
} }
/** /**
@@ -611,14 +611,14 @@ public class SingleDeviceTest extends AndroidTestCase {
// 3. destroy // 3. destroy
assertFalse("Subscribe not terminated", discoveryCb.hasCallbackAlreadyHappened( assertFalse("Subscribe not terminated", discoveryCb.hasCallbackAlreadyHappened(
DiscoverySessionCallbackTest.ON_SESSION_TERMINATED)); DiscoverySessionCallbackTest.ON_SESSION_TERMINATED));
discoverySession.destroy(); discoverySession.close();
// 4. try update post-destroy: should time-out waiting for cb // 4. try update post-destroy: should time-out waiting for cb
discoverySession.updateSubscribe(subscribeConfig); discoverySession.updateSubscribe(subscribeConfig);
assertFalse("Subscribe update post destroy", discoveryCb.waitForCallback( assertFalse("Subscribe update post destroy", discoveryCb.waitForCallback(
DiscoverySessionCallbackTest.ON_SESSION_CONFIG_UPDATED)); DiscoverySessionCallbackTest.ON_SESSION_CONFIG_UPDATED));
session.destroy(); session.close();
} }
/** /**
@@ -658,7 +658,7 @@ public class SingleDeviceTest extends AndroidTestCase {
assertFalse("Subscribe update post terminate", discoveryCb.waitForCallback( assertFalse("Subscribe update post terminate", discoveryCb.waitForCallback(
DiscoverySessionCallbackTest.ON_SESSION_CONFIG_UPDATED)); DiscoverySessionCallbackTest.ON_SESSION_CONFIG_UPDATED));
session.destroy(); session.close();
} }
/** /**
@@ -691,8 +691,8 @@ public class SingleDeviceTest extends AndroidTestCase {
// empty // empty
} }
discoverySession.destroy(); discoverySession.close();
session.destroy(); session.close();
} }
/** /**
@@ -725,8 +725,8 @@ public class SingleDeviceTest extends AndroidTestCase {
mConnectivityManager.requestNetwork(nr, networkCb, 2000); mConnectivityManager.requestNetwork(nr, networkCb, 2000);
assertTrue("OnUnavailable received", networkCb.waitForOnUnavailable()); assertTrue("OnUnavailable received", networkCb.waitForOnUnavailable());
discoverySession.destroy(); discoverySession.close();
session.destroy(); session.close();
} }
/** /**
@@ -760,8 +760,8 @@ public class SingleDeviceTest extends AndroidTestCase {
mConnectivityManager.requestNetwork(nr, networkCb, 2000); mConnectivityManager.requestNetwork(nr, networkCb, 2000);
assertTrue("OnUnavailable received", networkCb.waitForOnUnavailable()); assertTrue("OnUnavailable received", networkCb.waitForOnUnavailable());
discoverySession.destroy(); discoverySession.close();
session.destroy(); session.close();
} }
/** /**
@@ -788,7 +788,7 @@ public class SingleDeviceTest extends AndroidTestCase {
mConnectivityManager.requestNetwork(nr, networkCb, 2000); mConnectivityManager.requestNetwork(nr, networkCb, 2000);
assertTrue("OnUnavailable received", networkCb.waitForOnUnavailable()); assertTrue("OnUnavailable received", networkCb.waitForOnUnavailable());
session.destroy(); session.close();
} }
/** /**
@@ -816,7 +816,7 @@ public class SingleDeviceTest extends AndroidTestCase {
mConnectivityManager.requestNetwork(nr, networkCb, 2000); mConnectivityManager.requestNetwork(nr, networkCb, 2000);
assertTrue("OnUnavailable received", networkCb.waitForOnUnavailable()); assertTrue("OnUnavailable received", networkCb.waitForOnUnavailable());
session.destroy(); session.close();
} }
// local utilities // local utilities