Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 553162b6 authored by Andreas Gampe's avatar Andreas Gampe Committed by android-build-merger
Browse files

Merge "Connectivity: Fix map access" am: be04ebd7 

am: 81a6310c

Change-Id: Ice91ac58257551485231da4664027a281237de4b
parents 1dcba934 81a6310c

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

+1 −1
Original line number Diff line number Diff line
@@ -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(