commit | c39153361775ad65337161ea659e7dc30b36aedb | [log] [tgz] |
---|---|---|
author | Remi NGUYEN VAN <reminv@google.com> | Wed Jan 23 15:05:00 2019 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Jan 23 15:05:00 2019 +0000 |
tree | 21a1f344cd4d05781bdbd04d098d916f1d984017 | |
parent | af9048348fb80581101078422b165f2e22ab6882 [diff] | |
parent | 9cfced4623f4b9fbc988d36990f1325b4ed63d3d [diff] |
Merge changes I1250730c,I7d00848c * changes: Create a wrapper for IpClient Move IpClient to NetworkStack
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 38594ef..aa74600 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;