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

Commit 93155b3d authored by Lorenzo Colitti's avatar Lorenzo Colitti
Browse files

Disable mDefaultDns to see if we can remove it. 

Bug: 21146610
Change-Id: I385f1c8780acc97d955002f469a6c8ad65db1578
parent 84b83c5a

services/core/java/com/android/server/ConnectivityService.java

+6 −4
Original line number Diff line number Diff line
@@ -3796,10 +3796,12 @@ public class ConnectivityService extends IConnectivityManager.Stub 
//        }

        updateTcpBufferSizes(networkAgent);



        // TODO: deprecate and remove mDefaultDns when we can do so safely.

        // For now, use it only when the network has Internet access. http://b/18327075

        final boolean useDefaultDns = networkAgent.networkCapabilities.hasCapability(

                NET_CAPABILITY_INTERNET);

        // TODO: deprecate and remove mDefaultDns when we can do so safely. See http://b/18327075

        // In L, we used it only when the network had Internet access but provided no DNS servers.

        // For now, just disable it, and if disabling it doesn't break things, remove it.

        // final boolean useDefaultDns = networkAgent.networkCapabilities.hasCapability(

        //        NET_CAPABILITY_INTERNET);

        final boolean useDefaultDns = false;

        final boolean flushDns = updateRoutes(newLp, oldLp, netId);

        updateDnses(newLp, oldLp, netId, flushDns, useDefaultDns);