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

Commit d7f67240 authored by Paul Jensen's avatar Paul Jensen Committed by Android (Google) Code Review
Browse files

Merge "Make sure callback handler is in place before callbacks handled."

parents 7b4e0e14 7221cc3b

core/java/android/net/ConnectivityManager.java

+9 −9
Original line number Diff line number Diff line
@@ -2208,6 +2208,7 @@ public class ConnectivityManager { 
        if (need == null) throw new IllegalArgumentException("null NetworkCapabilities");

        try {

            incCallbackHandlerRefCount();

            synchronized(sNetworkCallback) {

                if (action == LISTEN) {

                    networkCallback.networkRequest = mService.listenForNetwork(need,

                            new Messenger(sCallbackHandler), new Binder());
@@ -2216,7 +2217,6 @@ public class ConnectivityManager { 
                            new Messenger(sCallbackHandler), timeoutSec, new Binder(), legacyType);

                }

                if (networkCallback.networkRequest != null) {

                synchronized(sNetworkCallback) {

                    sNetworkCallback.put(networkCallback.networkRequest, networkCallback);

                }

            }