commit 2fa28c39ae81e1f0a52b9ed1dc42289937f20bca
author Etan Cohen <etancohen@google.com> Thu Apr 20 16:30:22 2017 -0700
committer Etan Cohen <etancohen@google.com> Fri Apr 21 14:05:45 2017 -0700
tree bc93203e75ca4c9b2f0fe254f955243c253c8cef
parent d0177542536ec15b0e6f250caf6242e7043300a8

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

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

tests/cts/net/src/android/net/wifi/aware/cts/SingleDeviceTest.java

diff --git a/tests/cts/net/src/android/net/wifi/aware/cts/SingleDeviceTest.java b/tests/cts/net/src/android/net/wifi/aware/cts/SingleDeviceTest.java
index e134b46..d4982a5 100644
--- a/tests/cts/net/src/android/net/wifi/aware/cts/SingleDeviceTest.java
+++ b/tests/cts/net/src/android/net/wifi/aware/cts/SingleDeviceTest.java
@@ -386,7 +386,7 @@
         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 @@
         }
 
         WifiAwareSession session = attachAndGetSession();
-        session.destroy();
+        session.close();
     }
 
     /**
@@ -486,7 +486,7 @@
             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 @@
         // 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 @@
         assertFalse("Publish update post terminate", discoveryCb.waitForCallback(
                 DiscoverySessionCallbackTest.ON_SESSION_CONFIG_UPDATED));
 
-        session.destroy();
+        session.close();
     }
 
     /**
@@ -611,14 +611,14 @@
         // 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 @@
         assertFalse("Subscribe update post terminate", discoveryCb.waitForCallback(
                 DiscoverySessionCallbackTest.ON_SESSION_CONFIG_UPDATED));
 
-        session.destroy();
+        session.close();
     }
 
     /**
@@ -691,8 +691,8 @@
             // empty
         }
 
-        discoverySession.destroy();
-        session.destroy();
+        discoverySession.close();
+        session.close();
     }
 
     /**
@@ -725,8 +725,8 @@
         mConnectivityManager.requestNetwork(nr, networkCb, 2000);
         assertTrue("OnUnavailable received", networkCb.waitForOnUnavailable());
 
-        discoverySession.destroy();
-        session.destroy();
+        discoverySession.close();
+        session.close();
     }
 
     /**
@@ -760,8 +760,8 @@
         mConnectivityManager.requestNetwork(nr, networkCb, 2000);
         assertTrue("OnUnavailable received", networkCb.waitForOnUnavailable());
 
-        discoverySession.destroy();
-        session.destroy();
+        discoverySession.close();
+        session.close();
     }
 
     /**
@@ -788,7 +788,7 @@
         mConnectivityManager.requestNetwork(nr, networkCb, 2000);
         assertTrue("OnUnavailable received", networkCb.waitForOnUnavailable());
 
-        session.destroy();
+        session.close();
     }
 
     /**
@@ -816,7 +816,7 @@
         mConnectivityManager.requestNetwork(nr, networkCb, 2000);
         assertTrue("OnUnavailable received", networkCb.waitForOnUnavailable());
 
-        session.destroy();
+        session.close();
     }
 
     // local utilities