summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2014-05-16 08:54:07 -0700
committerRobert Greenwalt <rgreenwalt@google.com>2014-05-16 08:54:07 -0700
commit4064af844ca6e58dc2908525634c13c4be277eac (patch)
tree30fdba48bb89f1c9aa2af7228e84e0e486071d53 /services
parent7a91a7434af6542486466b88ad0bc8860fd1c594 (diff)
downloadframeworks_base-4064af844ca6e58dc2908525634c13c4be277eac.zip
frameworks_base-4064af844ca6e58dc2908525634c13c4be277eac.tar.gz
frameworks_base-4064af844ca6e58dc2908525634c13c4be277eac.tar.bz2
Clean up when we switch networks.
Need to unhitch mNetworkForRequestId when a network is no longer satisfying a request. Change-Id: I3b3cde7dd92ec87a76ae7a0825ad22e892fa8fd5
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 0708e55..3f4f295 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 " +