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

[AWARE] Rename destroy() method to close()

Browse Source 
Aware classes with destroy() methods (containing resources)
converted to be AutoCloseable. As such the destroy method
was renamed.

Bug: 37514387
Test: unit tests and integration (sl4a) tests passing.
Merged-In: I433d7cf6f4c60bab4230702075ea22b9c56f31af
Change-Id: I433d7cf6f4c60bab4230702075ea22b9c56f31af
This commit is contained in:
Etan Cohen
2017-04-20 16:30:22 -07:00
parent d017754253
commit 2fa28c39ae
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) {
for (WifiAwareSession session : mSessions) {
// no damage from destroying twice (i.e. ok if test cleaned up after itself already)
session.destroy();
session.close();
}
mSessions.clear();
}
@@ -453,7 +453,7 @@ public class SingleDeviceTest extends AndroidTestCase {
}
WifiAwareSession session = attachAndGetSession();
session.destroy();
session.close();
}
/**
@@ -486,7 +486,7 @@ public class SingleDeviceTest extends AndroidTestCase {
byte[] mac = identityL.getMac();
assertNotNull("Wi-Fi Aware discovery MAC: iteration " + i, mac);
session.destroy();
session.close();
macs.add(new TestUtils.MacWrapper(mac));
}
@@ -527,14 +527,14 @@ public class SingleDeviceTest extends AndroidTestCase {
// 3. destroy
assertFalse("Publish not terminated", discoveryCb.hasCallbackAlreadyHappened(
DiscoverySessionCallbackTest.ON_SESSION_TERMINATED));
discoverySession.destroy();
discoverySession.close();
// 4. try update post-destroy: should time-out waiting for cb
discoverySession.updatePublish(publishConfig);
assertFalse("Publish update post destroy", discoveryCb.waitForCallback(
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(
DiscoverySessionCallbackTest.ON_SESSION_CONFIG_UPDATED));
session.destroy();
session.close();
}
/**
@@ -611,14 +611,14 @@ public class SingleDeviceTest extends AndroidTestCase {
// 3. destroy
assertFalse("Subscribe not terminated", discoveryCb.hasCallbackAlreadyHappened(
DiscoverySessionCallbackTest.ON_SESSION_TERMINATED));
discoverySession.destroy();
discoverySession.close();
// 4. try update post-destroy: should time-out waiting for cb
discoverySession.updateSubscribe(subscribeConfig);
assertFalse("Subscribe update post destroy", discoveryCb.waitForCallback(
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(
DiscoverySessionCallbackTest.ON_SESSION_CONFIG_UPDATED));
session.destroy();
session.close();
}
/**
@@ -691,8 +691,8 @@ public class SingleDeviceTest extends AndroidTestCase {
// empty
}
discoverySession.destroy();
session.destroy();
discoverySession.close();
session.close();
}
/**
@@ -725,8 +725,8 @@ public class SingleDeviceTest extends AndroidTestCase {
mConnectivityManager.requestNetwork(nr, networkCb, 2000);
assertTrue("OnUnavailable received", networkCb.waitForOnUnavailable());
discoverySession.destroy();
session.destroy();
discoverySession.close();
session.close();
}
/**
@@ -760,8 +760,8 @@ public class SingleDeviceTest extends AndroidTestCase {
mConnectivityManager.requestNetwork(nr, networkCb, 2000);
assertTrue("OnUnavailable received", networkCb.waitForOnUnavailable());
discoverySession.destroy();
session.destroy();
discoverySession.close();
session.close();
}
/**
@@ -788,7 +788,7 @@ public class SingleDeviceTest extends AndroidTestCase {
mConnectivityManager.requestNetwork(nr, networkCb, 2000);
assertTrue("OnUnavailable received", networkCb.waitForOnUnavailable());
session.destroy();
session.close();
}
/**
@@ -816,7 +816,7 @@ public class SingleDeviceTest extends AndroidTestCase {
mConnectivityManager.requestNetwork(nr, networkCb, 2000);
assertTrue("OnUnavailable received", networkCb.waitForOnUnavailable());
session.destroy();
session.close();
}
// local utilities