commit a1b71308b593086fdc084fd5e49f33fb429d55db
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 62440684dc52cdcc1d21a9154524c8942a3f40fc
parent 54ddecb0f80006a5865be21dcd51b75e6bd9a22c
parent 39744fd0c74e8619373063275a381930b7e3ac78

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(