commit 49b4492b33b539b45e082e75454cb7a408cbf12d
author Lorenzo Colitti <lorenzo@google.com> Thu Jul 07 10:55:38 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 07 10:55:39 2016 +0000
tree 98dd05fed37b9e0e1b42709430f135aae09fc4ca
parent cde023a3ea9cdf1deaa5195edf4514d9157ad1e9
parent 70c70fa7e2f802bc59f0ea2a7a76a2995b4b525b

Merge "Rewrite lingering." into nyc-mr1-dev

core/java/android/net/ConnectivityManager.java

diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index a45e6f5..8d41379 100644
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -3103,14 +3103,11 @@
             throw new IllegalArgumentException("Invalid NetworkCallback");
         }
         try {
+            // CallbackHandler will release callback when receiving CALLBACK_RELEASED.
             mService.releaseNetworkRequest(networkCallback.networkRequest);
         } catch (RemoteException e) {
             throw e.rethrowFromSystemServer();
         }
-
-        synchronized (sNetworkCallback) {
-            sNetworkCallback.remove(networkCallback.networkRequest);
-        }
     }
 
     /**