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

Commit b4345078 authored by David Su's avatar David Su
Browse files

Migrate to public version of CloseGuard 

Migrate to android.util.CloseGuard, which
was exposed as a public API.

Bug: 145831809
Test: atest FrameworksWifiApiTests

Change-Id: I822cc2c080adb6902f2843e29204e71573d682ab
parent 9a1499fb

wifi/java/android/net/wifi/WifiManager.java

+8 −4
Original line number Diff line number Diff line
@@ -51,16 +51,16 @@ import android.os.RemoteException; 
import android.os.WorkSource;

import android.os.connectivity.WifiActivityEnergyInfo;

import android.text.TextUtils;

import android.util.CloseGuard;

import android.util.Log;

import android.util.Pair;



import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.VisibleForTesting;



import dalvik.system.CloseGuard;



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.lang.ref.Reference;

import java.lang.ref.WeakReference;

import java.net.InetAddress;

import java.util.ArrayList;
@@ -3574,7 +3574,7 @@ public class WifiManager { 
     */

    public class LocalOnlyHotspotReservation implements AutoCloseable {



        private final CloseGuard mCloseGuard = CloseGuard.get();

        private final CloseGuard mCloseGuard = new CloseGuard();

        private final WifiConfiguration mConfig;

        private boolean mClosed = false;
@@ -3601,6 +3601,8 @@ public class WifiManager { 
                }

            } catch (Exception e) {

                Log.e(TAG, "Failed to stop Local Only Hotspot.");

            } finally {

                Reference.reachabilityFence(this);

            }

        }
@@ -3725,7 +3727,7 @@ public class WifiManager { 
     * @hide

     */

    public class LocalOnlyHotspotSubscription implements AutoCloseable {

        private final CloseGuard mCloseGuard = CloseGuard.get();

        private final CloseGuard mCloseGuard = new CloseGuard();



        /** @hide */

        @VisibleForTesting
@@ -3740,6 +3742,8 @@ public class WifiManager { 
                mCloseGuard.close();

            } catch (Exception e) {

                Log.e(TAG, "Failed to unregister LocalOnlyHotspotObserver.");

            } finally {

                Reference.reachabilityFence(this);

            }

        }

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

+4 −3
Original line number Diff line number Diff line
@@ -20,12 +20,12 @@ import android.annotation.NonNull; 
import android.annotation.Nullable;

import android.annotation.SystemApi;

import android.net.NetworkSpecifier;

import android.util.CloseGuard;

import android.util.Log;



import com.android.internal.annotations.VisibleForTesting;



import dalvik.system.CloseGuard;



import java.lang.ref.Reference;

import java.lang.ref.WeakReference;



/**
@@ -58,7 +58,7 @@ public class DiscoverySession implements AutoCloseable { 
    /** @hide */

    protected boolean mTerminated = false;



    private final CloseGuard mCloseGuard = CloseGuard.get();

    private final CloseGuard mCloseGuard = new CloseGuard();



    /**

     * Return the maximum permitted retry count when sending messages using
@@ -108,6 +108,7 @@ public class DiscoverySession implements AutoCloseable { 
        mTerminated = true;

        mMgr.clear();

        mCloseGuard.close();

        Reference.reachabilityFence(this);

    }



    /**

wifi/java/android/net/wifi/aware/WifiAwareSession.java

+4 −3
Original line number Diff line number Diff line
@@ -23,12 +23,12 @@ import android.net.NetworkSpecifier; 
import android.os.Binder;

import android.os.Handler;

import android.os.Looper;

import android.util.CloseGuard;

import android.util.Log;



import com.android.internal.annotations.VisibleForTesting;



import dalvik.system.CloseGuard;



import java.lang.ref.Reference;

import java.lang.ref.WeakReference;



/**
@@ -45,7 +45,7 @@ public class WifiAwareSession implements AutoCloseable { 
    private final int mClientId;



    private boolean mTerminated = true;

    private final CloseGuard mCloseGuard = CloseGuard.get();

    private final CloseGuard mCloseGuard = new CloseGuard();



    /** @hide */

    public WifiAwareSession(WifiAwareManager manager, Binder binder, int clientId) {
@@ -80,6 +80,7 @@ public class WifiAwareSession implements AutoCloseable { 
        mTerminated = true;

        mMgr.clear();

        mCloseGuard.close();

        Reference.reachabilityFence(this);

    }



    /** @hide */

wifi/java/android/net/wifi/p2p/WifiP2pManager.java

+4 −3
Original line number Diff line number Diff line
@@ -44,15 +44,15 @@ import android.os.Message; 
import android.os.Messenger;

import android.os.RemoteException;

import android.text.TextUtils;

import android.util.CloseGuard;

import android.util.Log;



import com.android.internal.util.AsyncChannel;

import com.android.internal.util.Protocol;



import dalvik.system.CloseGuard;



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.lang.ref.Reference;

import java.util.HashMap;

import java.util.List;

import java.util.Map;
@@ -869,7 +869,7 @@ public class WifiP2pManager { 
        private final Object mListenerMapLock = new Object();

        private int mListenerKey = 0;



        private final CloseGuard mCloseGuard = CloseGuard.get();

        private final CloseGuard mCloseGuard = new CloseGuard();



        /**

         * Close the current P2P connection and indicate to the P2P service that connections
@@ -888,6 +888,7 @@ public class WifiP2pManager { 


            mAsyncChannel.disconnect();

            mCloseGuard.close();

            Reference.reachabilityFence(this);

        }



        /** @hide */