commit 9cfced4623f4b9fbc988d36990f1325b4ed63d3d
author Remi NGUYEN VAN <reminv@google.com> Thu Jan 10 19:12:46 2019 +0900
committer Remi NGUYEN VAN <reminv@google.com> Wed Jan 23 16:44:21 2019 +0900
tree ea946af8aa447525b54232e6da6c58416a346e25
parent eafed7dcba01318dfa0fa4c408eb7f356f1977e9

Move IpClient to NetworkStack

Test: atest FrameworksNetTests NetworkStackTests
Bug: b/112869080
Change-Id: I7d00848c052382cd1b6ce458868bed6a1e9e8ec5

core/java/android/net/util/MultinetworkPolicyTracker.java

diff --git a/services/net/java/android/net/util/MultinetworkPolicyTracker.java b/core/java/android/net/util/MultinetworkPolicyTracker.java
similarity index 100%
rename from services/net/java/android/net/util/MultinetworkPolicyTracker.java
rename to core/java/android/net/util/MultinetworkPolicyTracker.java

services/core/java/com/android/server/ConnectivityService.java

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index fae7a8d..d6cd902 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -100,7 +100,7 @@
 import android.net.shared.NetworkMonitorUtils;
 import android.net.shared.PrivateDnsConfig;
 import android.net.util.MultinetworkPolicyTracker;
-import android.net.util.NetdService;
+import android.net.shared.NetdService;
 import android.os.Binder;
 import android.os.Build;
 import android.os.Bundle;