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

Commit e235da5d authored by Pierre Imai's avatar Pierre Imai Committed by android-build-merger
Browse files

Merge "Fix a memory leak in ConnectivityManager." into nyc-dev 

am: 11a888fa

* commit '11a888fa':
  Fix a memory leak in ConnectivityManager.

Change-Id: I46160bd5070779641607d65ec5d234d65f039d6b
parents d6d7ed7f 11a888fa

core/java/android/net/ConnectivityManager.java

+5 −1
Original line number Diff line number Diff line
@@ -2734,7 +2734,7 @@ public class ConnectivityManager { 
    private void incCallbackHandlerRefCount() {

        synchronized(sCallbackRefCount) {

            if (sCallbackRefCount.incrementAndGet() == 1) {

                // TODO - switch this over to a ManagerThread or expire it when done

                // TODO: switch this to ConnectivityThread

                HandlerThread callbackThread = new HandlerThread("ConnectivityManager");

                callbackThread.start();

                sCallbackHandler = new CallbackHandler(callbackThread.getLooper(),
@@ -3093,6 +3093,10 @@ public class ConnectivityManager { 
        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }



        synchronized (sNetworkCallback) {

            sNetworkCallback.remove(networkCallback.networkRequest);

        }

    }



    /**