commit | ba0613358a100e3f5731ffc9d56c2f104f20a20d | [log] [tgz] |
---|---|---|
author | Andreas Gampe <agampe@google.com> | Mon Mar 05 17:23:07 2018 -0800 |
committer | Erik Kline <ek@google.com> | Wed Mar 07 11:36:57 2018 +0900 |
tree | 1a17afe4c77caf523c843ac7b5ba1648b1026172 | |
parent | 9aa32d0e71ac4fa6df1adee961a1100607f1acee [diff] [blame] |
Connectivity: Fix map access Found by Errorprone. Bug: 73288226 Test: mmma frameworks/base/services Merged-In: I1c4b35811c72d389e53e28c3eb1b411009471b92 Merged-In: Ice91ac58257551485231da4664027a281237de4b Merged-In: I7d2f578b54c69139be8b887a2381ac1b2e0673a3 Change-Id: I63edad58dbc909c1e772bde85a1b9dd98c551fb1 (cherry picked from commit 3ba8106c23cdf518527f75beaabb48bf3182fb4d)
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(