summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorHugo Benichi <hugobenichi@google.com>2016-04-19 11:53:43 +0900
committerHugo Benichi <hugobenichi@google.com>2016-04-19 14:26:53 +0900
commit23e0e805c543f3edad54ec71c6bc21147946511d (patch)
tree681d61c8cb170a0da3974c6dfb88058acc54b0f5 /core/java/android
parent3e38e6accf5586d350581a301e1ecfcadaf03b93 (diff)
Remove unused DHCP timeout event tag.
DHCP timeouts should not be logged at DHCPClient level but as a timeout event in IpManager. Bug: 28204408 Change-Id: Ia12619e3bf71102cf289cbbcdec53fd5e7e8efff
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/net/metrics/DhcpErrorEvent.java3
-rw-r--r--core/java/android/net/metrics/IpConnectivityEvent.java3
2 files changed, 2 insertions, 4 deletions
diff --git a/core/java/android/net/metrics/DhcpErrorEvent.java b/core/java/android/net/metrics/DhcpErrorEvent.java
index 910d94e515fa..46fdd18681a5 100644
--- a/core/java/android/net/metrics/DhcpErrorEvent.java
+++ b/core/java/android/net/metrics/DhcpErrorEvent.java
@@ -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) {
diff --git a/core/java/android/net/metrics/IpConnectivityEvent.java b/core/java/android/net/metrics/IpConnectivityEvent.java
index 96aa1cec9cfb..2eb8edb0702f 100644
--- a/core/java/android/net/metrics/IpConnectivityEvent.java
+++ b/core/java/android/net/metrics/IpConnectivityEvent.java
@@ -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;