Snap for 4638586 from 1fff4c000de08c612bf7e69d4958a3fa3cc2e3c0 to pi-release

Change-Id: I212013556116b20424c936b35518b8e86ececc94
2018-03-07 08:22:20 +00:00
parent 8c8d2e675a 85c8c3d822
commit a276cdabe7
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/connectivity/DnsManager.java
+++ b/services/core/java/com/android/server/connectivity/DnsManager.java
@@ -187,7 +187,7 @@ public class DnsManager {
        Slog.w(TAG, "updatePrivateDns(" + network + ", " + cfg + ")");
        return (cfg != null)
                ? mPrivateDnsMap.put(network.netId, cfg)
-                : mPrivateDnsMap.remove(network);
+                : mPrivateDnsMap.remove(network.netId);
    }

    public void setDnsConfigurationForNetwork(