From 290455ec58253e345d27b7dfb10b1cd4f65577ef Mon Sep 17 00:00:00 2001
From: Remi NGUYEN VAN <reminv@google.com>
Date: Thu, 10 Jan 2019 19:12:46 +0900
Subject: [PATCH] Move IpClient to NetworkStack

Test: atest FrameworksNetTests NetworkStackTests
Bug: b/112869080
Change-Id: I7d00848c052382cd1b6ce458868bed6a1e9e8ec5
---
 .../java/android/net/util/MultinetworkPolicyTracker.java        | 0
 services/core/java/com/android/server/ConnectivityService.java  | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename {services/net => core}/java/android/net/util/MultinetworkPolicyTracker.java (100%)

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
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index fae7a8d7bf..d6cd9022ee 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.netlink.InetDiagMessage;
 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;