diff options
Diffstat (limited to 'src')
8 files changed, 12 insertions, 12 deletions
diff --git a/src/android/net/captiveportal/CapportApiProbeResult.java b/src/android/net/captiveportal/CapportApiProbeResult.java index 3ef07ce..f693bed 100644 --- a/src/android/net/captiveportal/CapportApiProbeResult.java +++ b/src/android/net/captiveportal/CapportApiProbeResult.java @@ -18,7 +18,7 @@ package android.net.captiveportal; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.android.networkstack.apishim.CaptivePortalDataShim; +import com.android.networkstack.apishim.common.CaptivePortalDataShim; /** * Captive portal probe detection result including capport API detection result. diff --git a/src/android/net/dhcp/DhcpPacket.java b/src/android/net/dhcp/DhcpPacket.java index a4dbda1..d022973 100644 --- a/src/android/net/dhcp/DhcpPacket.java +++ b/src/android/net/dhcp/DhcpPacket.java @@ -31,7 +31,7 @@ import android.text.TextUtils; import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; -import com.android.networkstack.apishim.ShimUtils; +import com.android.networkstack.apishim.common.ShimUtils; import java.io.UnsupportedEncodingException; import java.net.Inet4Address; diff --git a/src/android/net/ip/IpClient.java b/src/android/net/ip/IpClient.java index c6373d7..2079b2b 100644 --- a/src/android/net/ip/IpClient.java +++ b/src/android/net/ip/IpClient.java @@ -77,9 +77,9 @@ import com.android.internal.util.MessageUtils; import com.android.internal.util.State; import com.android.internal.util.StateMachine; import com.android.internal.util.WakeupMessage; -import com.android.networkstack.apishim.NetworkInformationShim; import com.android.networkstack.apishim.NetworkInformationShimImpl; -import com.android.networkstack.apishim.ShimUtils; +import com.android.networkstack.apishim.common.NetworkInformationShim; +import com.android.networkstack.apishim.common.ShimUtils; import com.android.server.NetworkObserverRegistry; import com.android.server.NetworkStackService.NetworkStackServiceManager; diff --git a/src/android/net/ip/IpClientLinkObserver.java b/src/android/net/ip/IpClientLinkObserver.java index ee7f18b..dcbca94 100644 --- a/src/android/net/ip/IpClientLinkObserver.java +++ b/src/android/net/ip/IpClientLinkObserver.java @@ -37,8 +37,8 @@ import android.os.Handler; import android.system.OsConstants; import android.util.Log; -import com.android.networkstack.apishim.NetworkInformationShim; import com.android.networkstack.apishim.NetworkInformationShimImpl; +import com.android.networkstack.apishim.common.NetworkInformationShim; import com.android.server.NetworkObserver; import java.net.InetAddress; diff --git a/src/com/android/networkstack/NetworkStackNotifier.java b/src/com/android/networkstack/NetworkStackNotifier.java index 1e97617..a330c70 100644 --- a/src/com/android/networkstack/NetworkStackNotifier.java +++ b/src/com/android/networkstack/NetworkStackNotifier.java @@ -40,9 +40,9 @@ import androidx.annotation.Nullable; import androidx.annotation.StringRes; import androidx.annotation.VisibleForTesting; -import com.android.networkstack.apishim.CaptivePortalDataShim; -import com.android.networkstack.apishim.NetworkInformationShim; import com.android.networkstack.apishim.NetworkInformationShimImpl; +import com.android.networkstack.apishim.common.CaptivePortalDataShim; +import com.android.networkstack.apishim.common.NetworkInformationShim; import java.util.Hashtable; import java.util.function.Consumer; diff --git a/src/com/android/networkstack/netlink/TcpSocketTracker.java b/src/com/android/networkstack/netlink/TcpSocketTracker.java index f660f81..51b23fd 100644 --- a/src/com/android/networkstack/netlink/TcpSocketTracker.java +++ b/src/com/android/networkstack/netlink/TcpSocketTracker.java @@ -65,7 +65,7 @@ import androidx.annotation.Nullable; import com.android.internal.annotations.VisibleForTesting; import com.android.networkstack.apishim.NetworkShimImpl; -import com.android.networkstack.apishim.UnsupportedApiLevelException; +import com.android.networkstack.apishim.common.UnsupportedApiLevelException; import java.io.FileDescriptor; import java.io.InterruptedIOException; diff --git a/src/com/android/server/NetworkStackService.java b/src/com/android/server/NetworkStackService.java index 3a702e5..e478a80 100644 --- a/src/com/android/server/NetworkStackService.java +++ b/src/com/android/server/NetworkStackService.java @@ -57,7 +57,7 @@ import androidx.annotation.VisibleForTesting; import com.android.internal.annotations.GuardedBy; import com.android.internal.util.IndentingPrintWriter; import com.android.networkstack.NetworkStackNotifier; -import com.android.networkstack.apishim.ShimUtils; +import com.android.networkstack.apishim.common.ShimUtils; import com.android.server.connectivity.NetworkMonitor; import com.android.server.connectivity.ipmemorystore.IpMemoryStoreService; import com.android.server.util.PermissionUtil; diff --git a/src/com/android/server/connectivity/NetworkMonitor.java b/src/com/android/server/connectivity/NetworkMonitor.java index 6d9cab4..61dece0 100755 --- a/src/com/android/server/connectivity/NetworkMonitor.java +++ b/src/com/android/server/connectivity/NetworkMonitor.java @@ -158,11 +158,11 @@ import com.android.internal.util.StateMachine; import com.android.internal.util.TrafficStatsConstants; import com.android.networkstack.NetworkStackNotifier; import com.android.networkstack.R; -import com.android.networkstack.apishim.CaptivePortalDataShim; import com.android.networkstack.apishim.CaptivePortalDataShimImpl; import com.android.networkstack.apishim.NetworkInformationShimImpl; -import com.android.networkstack.apishim.ShimUtils; -import com.android.networkstack.apishim.UnsupportedApiLevelException; +import com.android.networkstack.apishim.common.CaptivePortalDataShim; +import com.android.networkstack.apishim.common.ShimUtils; +import com.android.networkstack.apishim.common.UnsupportedApiLevelException; import com.android.networkstack.metrics.DataStallDetectionStats; import com.android.networkstack.metrics.DataStallStatsUtils; import com.android.networkstack.netlink.TcpSocketTracker; |