commit f980a0f56fb2b078b9fa252eed37388e6d5a0f6c
author Paul Jensen <pauljensen@google.com> Fri Jun 27 11:05:32 2014 -0400
committer Paul Jensen <pauljensen@google.com> Wed Jul 02 13:50:53 2014 +0000
tree 8cfa68adf2b70503d76bf5adb9647c21deaf00f7
parent 201d45f09077a2f853c33c749dae1b7250138b43

Make sure callback handler is in place before callbacks handled.

When making Network requests in ConnectivityManager, make sure we install the
callback prior to a response from ConnectivityService arriving causing us to
search for the callback and inadvertently not find it.

bug:15928097
Change-Id: Ie5feb9cc8f5effc19870f54dba07218b2e11d82a

core/java/android/net/ConnectivityManager.java

diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index a8b324a..05e179d 100644
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -2208,15 +2208,15 @@
         if (need == null) throw new IllegalArgumentException("null NetworkCapabilities");
         try {
             incCallbackHandlerRefCount();
-            if (action == LISTEN) {
-                networkCallback.networkRequest = mService.listenForNetwork(need,
-                        new Messenger(sCallbackHandler), new Binder());
-            } else {
-                networkCallback.networkRequest = mService.requestNetwork(need,
-                        new Messenger(sCallbackHandler), timeoutSec, new Binder(), legacyType);
-            }
-            if (networkCallback.networkRequest != null) {
-                synchronized(sNetworkCallback) {
+            synchronized(sNetworkCallback) {
+                if (action == LISTEN) {
+                    networkCallback.networkRequest = mService.listenForNetwork(need,
+                            new Messenger(sCallbackHandler), new Binder());
+                } else {
+                    networkCallback.networkRequest = mService.requestNetwork(need,
+                            new Messenger(sCallbackHandler), timeoutSec, new Binder(), legacyType);
+                }
+                if (networkCallback.networkRequest != null) {
                     sNetworkCallback.put(networkCallback.networkRequest, networkCallback);
                 }
             }