commit be04ebd707df77020a66cd3d6267fad6ca09f5fd
author Treehugger Robot <treehugger-gerrit@google.com> Tue Mar 06 05:39:39 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 06 05:39:39 2018 +0000
tree bc71dd96d322a0dce5fe5dd69f0c335b5df31ad0
parent 6455e31b760869698f8ef09e21b2384941915832
parent 3ba8106c23cdf518527f75beaabb48bf3182fb4d

Merge "Connectivity: Fix map access"

services/core/java/com/android/server/connectivity/DnsManager.java

diff --git a/services/core/java/com/android/server/connectivity/DnsManager.java b/services/core/java/com/android/server/connectivity/DnsManager.java
index a1c54bd..557828a 100644
--- a/services/core/java/com/android/server/connectivity/DnsManager.java
+++ b/services/core/java/com/android/server/connectivity/DnsManager.java
@@ -187,7 +187,7 @@
         Slog.w(TAG, "updatePrivateDns(" + network + ", " + cfg + ")");
         return (cfg != null)
                 ? mPrivateDnsMap.put(network.netId, cfg)
-                : mPrivateDnsMap.remove(network);
+                : mPrivateDnsMap.remove(network.netId);
     }
 
     public void setDnsConfigurationForNetwork(