commit 1f7f52b16ec7c65c5ebd36450f9a36b45a0a0e1d
author Remi NGUYEN VAN <reminv@google.com> Mon Aug 13 15:54:27 2018 +0900
committer Remi NGUYEN VAN <reminv@google.com> Tue Aug 28 12:50:47 2018 +0900
tree 431f8c8a61da08eca6398525b3440fe3225c171d
parent 107237c41c5515698ff4f5cbdbd3c331a112c875

Add DhcpServer

This first version can serve discover/request/release, although there
are some small behavior changes with current implementation which will
be addressed later.

Also removes final modifiers on start() and stop() in FdEventsReader, to
allow mocking the methods in tests with the current mockito lib.

Test: Added tests pass, manual: flashed a device using the server
Change-Id: I025366ff7d51c4ba31152af50f3dd2b5e280a54d

core/java/android/net/TrafficStats.java

diff --git a/core/java/android/net/TrafficStats.java b/core/java/android/net/TrafficStats.java
index 44f7e48..1b22911 100644
--- a/core/java/android/net/TrafficStats.java
+++ b/core/java/android/net/TrafficStats.java
@@ -139,6 +139,8 @@
     public static final int TAG_SYSTEM_GPS = 0xFFFFFF44;
     /** @hide */
     public static final int TAG_SYSTEM_PAC = 0xFFFFFF45;
+    /** @hide */
+    public static final int TAG_SYSTEM_DHCP_SERVER = 0xFFFFFF46;
 
     private static INetworkStatsService sStatsService;