Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1d90d9e authored by Etan Cohen's avatar Etan Cohen
Browse files

[AWARE] Add AutoCloseable interface/implementation 

Make resource holding classes AutoCloseable. These are objects
which (already) require the client to call a destroy() method.

Note: the destroy() method was renamed to close() - no sense in
identical/duplicate methods.

Bug: 37514387
Test: unit tests and integration (sl4a) tests passing.
Merged-In: Ia14065ab9dcd92481412532bfdb198f2e8d9f83c
Change-Id: Ia14065ab9dcd92481412532bfdb198f2e8d9f83c
parent fd25662e

api/current.txt

+4 −4
Original line number Diff line number Diff line
@@ -26737,10 +26737,10 @@ package android.net.wifi.aware { 
    field public static final android.os.Parcelable.Creator<android.net.wifi.aware.Characteristics> CREATOR;

  }













  public class DiscoverySession {













  public class DiscoverySession implements java.lang.AutoCloseable {













    method public void close();















    method public android.net.NetworkSpecifier createNetworkSpecifierOpen(android.net.wifi.aware.PeerHandle);















    method public android.net.NetworkSpecifier createNetworkSpecifierPassphrase(android.net.wifi.aware.PeerHandle, java.lang.String);













    method public void destroy();















    method public void sendMessage(android.net.wifi.aware.PeerHandle, int, byte[]);















  }
























@@ -26824,10 +26824,10 @@ package android.net.wifi.aware {













    field public static final int WIFI_AWARE_DATA_PATH_ROLE_RESPONDER = 1; // 0x1















  }



























  public class WifiAwareSession {













  public class WifiAwareSession implements java.lang.AutoCloseable {













    method public void close();















    method public android.net.NetworkSpecifier createNetworkSpecifierOpen(int, byte[]);















    method public android.net.NetworkSpecifier createNetworkSpecifierPassphrase(int, byte[], java.lang.String);













    method public void destroy();















    method public void publish(android.net.wifi.aware.PublishConfig, android.net.wifi.aware.DiscoverySessionCallback, android.os.Handler);















    method public void subscribe(android.net.wifi.aware.SubscribeConfig, android.net.wifi.aware.DiscoverySessionCallback, android.os.Handler);















  }

























api/system-current.txt



+4
−4




























Original line number
Diff line number
Diff line








@@ -29480,11 +29480,11 @@ package android.net.wifi.aware {













    field public static final android.os.Parcelable.Creator<android.net.wifi.aware.Characteristics> CREATOR;















  }



























  public class DiscoverySession {













  public class DiscoverySession implements java.lang.AutoCloseable {













    method public void close();















    method public android.net.NetworkSpecifier createNetworkSpecifierOpen(android.net.wifi.aware.PeerHandle);















    method public android.net.NetworkSpecifier createNetworkSpecifierPassphrase(android.net.wifi.aware.PeerHandle, java.lang.String);















    method public android.net.NetworkSpecifier createNetworkSpecifierPmk(android.net.wifi.aware.PeerHandle, byte[]);













    method public void destroy();















    method public void sendMessage(android.net.wifi.aware.PeerHandle, int, byte[]);















  }
























@@ -29568,11 +29568,11 @@ package android.net.wifi.aware {













    field public static final int WIFI_AWARE_DATA_PATH_ROLE_RESPONDER = 1; // 0x1















  }



























  public class WifiAwareSession {













  public class WifiAwareSession implements java.lang.AutoCloseable {













    method public void close();















    method public android.net.NetworkSpecifier createNetworkSpecifierOpen(int, byte[]);















    method public android.net.NetworkSpecifier createNetworkSpecifierPassphrase(int, byte[], java.lang.String);















    method public android.net.NetworkSpecifier createNetworkSpecifierPmk(int, byte[], byte[]);













    method public void destroy();















    method public void publish(android.net.wifi.aware.PublishConfig, android.net.wifi.aware.DiscoverySessionCallback, android.os.Handler);















    method public void subscribe(android.net.wifi.aware.SubscribeConfig, android.net.wifi.aware.DiscoverySessionCallback, android.os.Handler);















  }

























api/test-current.txt



+4
−4




























Original line number
Diff line number
Diff line








@@ -26844,10 +26844,10 @@ package android.net.wifi.aware {













    field public static final android.os.Parcelable.Creator<android.net.wifi.aware.Characteristics> CREATOR;















  }



























  public class DiscoverySession {













  public class DiscoverySession implements java.lang.AutoCloseable {













    method public void close();















    method public android.net.NetworkSpecifier createNetworkSpecifierOpen(android.net.wifi.aware.PeerHandle);















    method public android.net.NetworkSpecifier createNetworkSpecifierPassphrase(android.net.wifi.aware.PeerHandle, java.lang.String);













    method public void destroy();















    method public void sendMessage(android.net.wifi.aware.PeerHandle, int, byte[]);















  }
























@@ -26931,10 +26931,10 @@ package android.net.wifi.aware {













    field public static final int WIFI_AWARE_DATA_PATH_ROLE_RESPONDER = 1; // 0x1















  }



























  public class WifiAwareSession {













  public class WifiAwareSession implements java.lang.AutoCloseable {













    method public void close();















    method public android.net.NetworkSpecifier createNetworkSpecifierOpen(int, byte[]);















    method public android.net.NetworkSpecifier createNetworkSpecifierPassphrase(int, byte[], java.lang.String);













    method public void destroy();















    method public void publish(android.net.wifi.aware.PublishConfig, android.net.wifi.aware.DiscoverySessionCallback, android.os.Handler);















    method public void subscribe(android.net.wifi.aware.SubscribeConfig, android.net.wifi.aware.DiscoverySessionCallback, android.os.Handler);















  }

























wifi/java/android/net/wifi/aware/DiscoverySession.java



+5
−4




























Original line number
Diff line number
Diff line








@@ -38,10 +38,10 @@ import java.lang.ref.WeakReference;













 *     {@link #createNetworkSpecifierOpen(PeerHandle)} or















 *     {@link #createNetworkSpecifierPassphrase(PeerHandle, String)}.















 * </ul>













 * The {@link #destroy()} method must be called to destroy discovery sessions once they are













 * The {@link #close()} method must be called to destroy discovery sessions once they are















 * no longer needed.















 */













public class DiscoverySession {













public class DiscoverySession implements AutoCloseable {















    private static final String TAG = "DiscoverySession";















    private static final boolean DBG = false;















    private static final boolean VDBG = false; // STOPSHIP if true










@@ -96,7 +96,8 @@ public class DiscoverySession {













     *     exception is a session for which we received a termination callback,















     *     {@link DiscoverySessionCallback#onSessionTerminated()}.















     */













    public void destroy() {













    @Override













    public void close() {















        WifiAwareManager mgr = mMgr.get();















        if (mgr == null) {















            Log.w(TAG, "destroy: called post GC on WifiAwareManager");










@@ -131,7 +132,7 @@ public class DiscoverySession {













        try {















            if (!mTerminated) {















                mCloseGuard.warnIfOpen();













                destroy();













                close();















            }















        } finally {















            super.finalize();

































wifi/java/android/net/wifi/aware/DiscoverySessionCallback.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -84,7 +84,7 @@ public class DiscoverySessionCallback {





























    /**















     * Called when a discovery session (publish or subscribe) terminates. Termination may be due













     * to user-request (either directly through {@link DiscoverySession#destroy()} or













     * to user-request (either directly through {@link DiscoverySession#close()} or















     * application-specified expiration, e.g. {@link PublishConfig.Builder#setTtlSec(int)}















     * or {@link SubscribeConfig.Builder#setTtlSec(int)}).















     */