commit 0b9c645be12146cb1bfe43161768b797d3beb014
author Remi NGUYEN VAN <reminv@google.com> Tue Mar 06 06:52:35 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 06 06:52:35 2018 +0000
tree 7aa586e80a7d39b92594e445df0469bb0f9b504f
parent da5e6f2b0e59535f9cafe2ddd53e745a75863495
parent ccd9b36e7b007a8a4b5a60e6b4b2cc0d2f80eb8a

Merge "Allow null subscriberId in NetworkStatsManager."

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(