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

diff --git a/api/system-current.txt b/api/system-current.txt
index acb699d..5ea800c 100644 (file)
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -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

diff --git a/core/java/android/net/metrics/DhcpErrorEvent.java b/core/java/android/net/metrics/DhcpErrorEvent.java
index 910d94e..46fdd18 100644 (file)
--- 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 96aa1ce..2eb8edb 100644 (file)
--- 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;