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

Commit 26f40cc3 authored by Hui Lu's avatar Hui Lu Committed by Android Git Automerger
Browse files

am 61c0f547: Merge "Add interface name for proxy network type." into klp-modular-dev 

* commit '61c0f547':
  Add interface name for proxy network type.
parents 21483b9f 61c0f547

core/java/android/net/ProxyDataTracker.java

+5 −3
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ public class ProxyDataTracker extends BaseNetworkStateTracker { 
    // TODO: investigate how to get these DNS addresses from the system.

    private static final String DNS1 = "8.8.8.8";

    private static final String DNS2 = "8.8.4.4";

    private static final String INTERFACE_NAME = "ifb0";

    private static final String REASON_ENABLED = "enabled";

    private static final String REASON_DISABLED = "disabled";

    private static final String REASON_PROXY_DOWN = "proxy_down";
@@ -109,6 +110,7 @@ public class ProxyDataTracker extends BaseNetworkStateTracker { 
        try {

            mLinkProperties.addDns(InetAddress.getByName(DNS1));

            mLinkProperties.addDns(InetAddress.getByName(DNS2));

            mLinkProperties.setInterfaceName(INTERFACE_NAME);

        } catch (UnknownHostException e) {

            Log.e(TAG, "Could not add DNS address", e);

        }