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

Commit 6e1d1dbd authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove unused DHCP timeout event tag." into nyc-dev

parents 6783384e 23e0e805

api/system-current.txt

+1 −2
Original line number Diff line number Diff line
@@ -26097,8 +26097,7 @@ package android.net.metrics { 
    field public static final int IPCE_DHCP_BASE = 1024; // 0x400

    field public static final int IPCE_DHCP_PARSE_ERROR = 1025; // 0x401

    field public static final int IPCE_DHCP_RECV_ERROR = 1024; // 0x400

    field public static final int IPCE_DHCP_STATE_CHANGE = 1027; // 0x403

    field public static final int IPCE_DHCP_TIMEOUT = 1026; // 0x402

    field public static final int IPCE_DHCP_STATE_CHANGE = 1026; // 0x402

    field public static final int IPCE_DNS_BASE = 5120; // 0x1400

    field public static final int IPCE_DNS_LOOKUPS = 5120; // 0x1400

    field public static final int IPCE_IPMGR_BASE = 4096; // 0x1000

core/java/android/net/metrics/DhcpErrorEvent.java

+1 −2
Original line number Diff line number Diff line
@@ -93,8 +93,7 @@ public final class DhcpErrorEvent extends IpConnectivityEvent implements Parcela 
    }



    public static void logReceiveError(String ifName) {

        IpConnectivityEvent.logEvent(IPCE_DHCP_RECV_ERROR,

                new DhcpErrorEvent(ifName, RECEIVE_ERROR));

        logEvent(IPCE_DHCP_RECV_ERROR, new DhcpErrorEvent(ifName, RECEIVE_ERROR));

    }



    public static int errorCodeWithOption(int errorCode, int option) {

core/java/android/net/metrics/IpConnectivityEvent.java

+1 −2
Original line number Diff line number Diff line
@@ -45,8 +45,7 @@ public abstract class IpConnectivityEvent { 


    public static final int IPCE_DHCP_RECV_ERROR           = IPCE_DHCP_BASE + 0;

    public static final int IPCE_DHCP_PARSE_ERROR          = IPCE_DHCP_BASE + 1;

    public static final int IPCE_DHCP_TIMEOUT              = IPCE_DHCP_BASE + 2;

    public static final int IPCE_DHCP_STATE_CHANGE         = IPCE_DHCP_BASE + 3;

    public static final int IPCE_DHCP_STATE_CHANGE         = IPCE_DHCP_BASE + 2;



    public static final int IPCE_NETMON_STATE_CHANGE       = IPCE_NETMON_BASE + 0;

    public static final int IPCE_NETMON_CHECK_RESULT       = IPCE_NETMON_BASE + 1;