commit 908eb0832602124aeba06530f6bdfe4c5b29b425
author Junyu Lai <junyulai@google.com> Thu Jan 24 05:06:39 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 24 05:06:39 2019 +0000
tree 5c91e65776c8953176bd4c342f2592f106a6e79b
parent c39153361775ad65337161ea659e7dc30b36aedb
parent 48a5938ee89f8d7c3dcfb4bbf1bdf95cb0e395e3

Merge changes from topic "ka05"

* changes:
  [KA05] Export keepalive offload api for IpSec Nat-T file descriptor
  [KA01] export SocketKeepalive API for NAT-T keepalive

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 2a7d025..fda7279 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -101,7 +101,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;