summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2014-05-16 17:16:19 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-05-16 17:16:19 +0000
commitfcfef283d8707f8e695645fe10dba531b7673c14 (patch)
treebb0e62e51b5dcd8d26498cffe0d6767da01621fd /services
parent1c62e72ada3a5fa9b46a2c9373f8a9626cbfc6ad (diff)
parent4064af844ca6e58dc2908525634c13c4be277eac (diff)
downloadframeworks_base-fcfef283d8707f8e695645fe10dba531b7673c14.zip
frameworks_base-fcfef283d8707f8e695645fe10dba531b7673c14.tar.gz
frameworks_base-fcfef283d8707f8e695645fe10dba531b7673c14.tar.bz2
Merge "Clean up when we switch networks."
Diffstat (limited to 'services')
-rw-r--r--services/core/java/com/android/server/ConnectivityService.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 982dce0..2d0f6d1 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -3216,6 +3216,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
// tell the network currently servicing this that it's no longer interested
NetworkAgentInfo affectedNetwork = mNetworkForRequestId.get(nri.request.requestId);
if (affectedNetwork != null) {
+ mNetworkForRequestId.remove(nri.request.requestId);
affectedNetwork.networkRequests.remove(nri.request.requestId);
if (VDBG) {
log(" Removing from current network " + affectedNetwork.name() + ", leaving " +