Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2016-04-19 07:08:03 +00:00
committed by Android (Google) Code Review
parent 6783384eb1 23e0e805c5
commit 6e1d1dbdd4
3 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/system-current.txt
View File

@@ -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

3
core/java/android/net/metrics/DhcpErrorEvent.java
View File

@@ -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) {

3
core/java/android/net/metrics/IpConnectivityEvent.java
View File

@@ -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;