diff options
Diffstat (limited to 'src')
21 files changed, 56 insertions, 39 deletions
diff --git a/src/android/net/NetworkStackIpMemoryStore.java b/src/android/net/NetworkStackIpMemoryStore.java index 41715b2..850faaf 100644 --- a/src/android/net/NetworkStackIpMemoryStore.java +++ b/src/android/net/NetworkStackIpMemoryStore.java @@ -16,9 +16,10 @@ package android.net; -import android.annotation.NonNull; import android.content.Context; +import androidx.annotation.NonNull; + import java.util.concurrent.ExecutionException; import java.util.function.Consumer; diff --git a/src/android/net/apf/ApfFilter.java b/src/android/net/apf/ApfFilter.java index 2f74ad6..33f69f4 100644 --- a/src/android/net/apf/ApfFilter.java +++ b/src/android/net/apf/ApfFilter.java @@ -33,7 +33,6 @@ import static com.android.server.util.NetworkStackConstants.ICMPV6_ROUTER_ADVERT import static com.android.server.util.NetworkStackConstants.ICMPV6_ROUTER_SOLICITATION; import static com.android.server.util.NetworkStackConstants.IPV6_ADDR_LEN; -import android.annotation.Nullable; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -59,6 +58,8 @@ import android.text.format.DateUtils; import android.util.Log; import android.util.SparseArray; +import androidx.annotation.Nullable; + import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.HexDump; diff --git a/src/android/net/dhcp/DhcpClient.java b/src/android/net/dhcp/DhcpClient.java index e88c7cc..c4a0902 100644 --- a/src/android/net/dhcp/DhcpClient.java +++ b/src/android/net/dhcp/DhcpClient.java @@ -46,8 +46,6 @@ import static android.system.OsConstants.SO_REUSEADDR; import static com.android.server.util.NetworkStackConstants.IPV4_ADDR_ANY; -import android.annotation.NonNull; -import android.annotation.Nullable; import android.content.Context; import android.net.DhcpResults; import android.net.InetAddresses; @@ -73,6 +71,9 @@ import android.util.EventLog; import android.util.Log; import android.util.SparseArray; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.HexDump; import com.android.internal.util.MessageUtils; diff --git a/src/android/net/dhcp/DhcpLease.java b/src/android/net/dhcp/DhcpLease.java index 6849cfa..37d9cc0 100644 --- a/src/android/net/dhcp/DhcpLease.java +++ b/src/android/net/dhcp/DhcpLease.java @@ -16,12 +16,13 @@ package android.net.dhcp; -import android.annotation.NonNull; -import android.annotation.Nullable; import android.net.MacAddress; import android.os.SystemClock; import android.text.TextUtils; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.android.internal.util.HexDump; import java.net.Inet4Address; diff --git a/src/android/net/dhcp/DhcpLeaseRepository.java b/src/android/net/dhcp/DhcpLeaseRepository.java index 0a15cd7..d22193b 100644 --- a/src/android/net/dhcp/DhcpLeaseRepository.java +++ b/src/android/net/dhcp/DhcpLeaseRepository.java @@ -27,14 +27,15 @@ import static com.android.server.util.NetworkStackConstants.IPV4_ADDR_BITS; import static java.lang.Math.min; -import android.annotation.NonNull; -import android.annotation.Nullable; import android.net.IpPrefix; import android.net.MacAddress; import android.net.dhcp.DhcpServer.Clock; import android.net.util.SharedLog; import android.util.ArrayMap; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import java.net.Inet4Address; import java.util.ArrayList; import java.util.Collections; diff --git a/src/android/net/dhcp/DhcpPacket.java b/src/android/net/dhcp/DhcpPacket.java index 79e1c4f..efce6a5 100644 --- a/src/android/net/dhcp/DhcpPacket.java +++ b/src/android/net/dhcp/DhcpPacket.java @@ -3,7 +3,6 @@ package android.net.dhcp; import static com.android.server.util.NetworkStackConstants.IPV4_ADDR_ALL; import static com.android.server.util.NetworkStackConstants.IPV4_ADDR_ANY; -import android.annotation.Nullable; import android.net.DhcpResults; import android.net.LinkAddress; import android.net.metrics.DhcpErrorEvent; @@ -13,7 +12,8 @@ import android.os.SystemProperties; import android.system.OsConstants; import android.text.TextUtils; -import com.android.internal.annotations.VisibleForTesting; +import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; import java.io.UnsupportedEncodingException; import java.net.Inet4Address; diff --git a/src/android/net/dhcp/DhcpPacketListener.java b/src/android/net/dhcp/DhcpPacketListener.java index 97d26c7..c9235da 100644 --- a/src/android/net/dhcp/DhcpPacketListener.java +++ b/src/android/net/dhcp/DhcpPacketListener.java @@ -16,12 +16,13 @@ package android.net.dhcp; -import android.annotation.NonNull; -import android.annotation.Nullable; import android.net.util.FdEventsReader; import android.os.Handler; import android.system.Os; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import java.io.FileDescriptor; import java.net.Inet4Address; import java.net.InetSocketAddress; diff --git a/src/android/net/dhcp/DhcpServer.java b/src/android/net/dhcp/DhcpServer.java index f75fe18..37dd972 100644 --- a/src/android/net/dhcp/DhcpServer.java +++ b/src/android/net/dhcp/DhcpServer.java @@ -38,8 +38,6 @@ import static com.android.server.util.PermissionUtil.enforceNetworkStackCallingP import static java.lang.Integer.toUnsignedLong; -import android.annotation.NonNull; -import android.annotation.Nullable; import android.net.INetworkStackStatusCallback; import android.net.MacAddress; import android.net.TrafficStats; @@ -57,7 +55,10 @@ import android.system.Os; import android.text.TextUtils; import android.util.Pair; -import com.android.internal.annotations.VisibleForTesting; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; + import com.android.internal.util.HexDump; import java.io.FileDescriptor; diff --git a/src/android/net/dhcp/DhcpServingParams.java b/src/android/net/dhcp/DhcpServingParams.java index 230b693..eafe44e 100644 --- a/src/android/net/dhcp/DhcpServingParams.java +++ b/src/android/net/dhcp/DhcpServingParams.java @@ -25,13 +25,14 @@ import static com.android.server.util.NetworkStackConstants.IPV4_MIN_MTU; import static java.lang.Integer.toUnsignedLong; -import android.annotation.NonNull; -import android.annotation.Nullable; import android.net.IpPrefix; import android.net.LinkAddress; import android.net.shared.Inet4AddressUtils; import android.util.ArraySet; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import java.net.Inet4Address; import java.util.Arrays; import java.util.Collections; diff --git a/src/android/net/ip/IpClient.java b/src/android/net/ip/IpClient.java index 98e1e49..9f1f17c 100644 --- a/src/android/net/ip/IpClient.java +++ b/src/android/net/ip/IpClient.java @@ -21,7 +21,6 @@ import static android.net.shared.IpConfigurationParcelableUtil.toStableParcelabl import static com.android.server.util.PermissionUtil.enforceNetworkStackCallingPermission; -import android.annotation.NonNull; import android.content.Context; import android.net.ConnectivityManager; import android.net.DhcpResults; @@ -56,6 +55,8 @@ import android.util.Log; import android.util.Pair; import android.util.SparseArray; +import androidx.annotation.NonNull; + import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.IState; import com.android.internal.util.IndentingPrintWriter; diff --git a/src/android/net/util/FdEventsReader.java b/src/android/net/util/FdEventsReader.java index e82c69b..5a1154f 100644 --- a/src/android/net/util/FdEventsReader.java +++ b/src/android/net/util/FdEventsReader.java @@ -19,14 +19,15 @@ package android.net.util; import static android.os.MessageQueue.OnFileDescriptorEventListener.EVENT_ERROR; import static android.os.MessageQueue.OnFileDescriptorEventListener.EVENT_INPUT; -import android.annotation.NonNull; -import android.annotation.Nullable; import android.os.Handler; import android.os.Looper; import android.os.MessageQueue; import android.system.ErrnoException; import android.system.OsConstants; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import java.io.FileDescriptor; import java.io.IOException; diff --git a/src/android/net/util/NetworkStackUtils.java b/src/android/net/util/NetworkStackUtils.java index 0a18c0e..b2deefd 100644 --- a/src/android/net/util/NetworkStackUtils.java +++ b/src/android/net/util/NetworkStackUtils.java @@ -16,14 +16,15 @@ package android.net.util; -import android.annotation.NonNull; -import android.annotation.Nullable; import android.content.Context; import android.content.pm.PackageManager.NameNotFoundException; import android.provider.DeviceConfig; import android.util.Log; import android.util.SparseArray; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import java.io.FileDescriptor; import java.io.IOException; import java.net.Inet4Address; diff --git a/src/com/android/networkstack/metrics/DataStallDetectionStats.java b/src/com/android/networkstack/metrics/DataStallDetectionStats.java index 2523ecd..7a1f9ac 100644 --- a/src/com/android/networkstack/metrics/DataStallDetectionStats.java +++ b/src/com/android/networkstack/metrics/DataStallDetectionStats.java @@ -16,11 +16,12 @@ package com.android.networkstack.metrics; -import android.annotation.NonNull; -import android.annotation.Nullable; import android.net.util.NetworkStackUtils; import android.net.wifi.WifiInfo; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.android.internal.util.HexDump; import com.android.server.connectivity.nano.CellularData; import com.android.server.connectivity.nano.DataStallEventProto; diff --git a/src/com/android/networkstack/metrics/DataStallStatsUtils.java b/src/com/android/networkstack/metrics/DataStallStatsUtils.java index 59e8fd3..e7a6c3d 100644 --- a/src/com/android/networkstack/metrics/DataStallStatsUtils.java +++ b/src/com/android/networkstack/metrics/DataStallStatsUtils.java @@ -16,11 +16,11 @@ package com.android.networkstack.metrics; -import android.annotation.NonNull; -import android.annotation.Nullable; import android.net.captiveportal.CaptivePortalProbeResult; import android.util.Log; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; import com.android.internal.util.HexDump; diff --git a/src/com/android/networkstack/util/DnsUtils.java b/src/com/android/networkstack/util/DnsUtils.java index 759807b..c47ccc1 100644 --- a/src/com/android/networkstack/util/DnsUtils.java +++ b/src/com/android/networkstack/util/DnsUtils.java @@ -20,14 +20,15 @@ import static android.net.DnsResolver.FLAG_NO_CACHE_LOOKUP; import static android.net.DnsResolver.TYPE_A; import static android.net.DnsResolver.TYPE_AAAA; -import android.annotation.NonNull; -import android.annotation.Nullable; import android.net.DnsResolver; import android.net.Network; import android.net.TrafficStats; import android.net.util.Stopwatch; import android.util.Log; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.android.internal.util.TrafficStatsConstants; import com.android.server.connectivity.NetworkMonitor.DnsLogFunc; diff --git a/src/com/android/server/NetworkObserverRegistry.java b/src/com/android/server/NetworkObserverRegistry.java index b83bc5c..dcb42c0 100644 --- a/src/com/android/server/NetworkObserverRegistry.java +++ b/src/com/android/server/NetworkObserverRegistry.java @@ -17,7 +17,6 @@ package com.android.server; import static android.net.RouteInfo.RTN_UNICAST; -import android.annotation.NonNull; import android.net.INetd; import android.net.INetdUnsolicitedEventListener; import android.net.InetAddresses; @@ -28,6 +27,8 @@ import android.os.Handler; import android.os.RemoteException; import android.util.Log; +import androidx.annotation.NonNull; + import java.util.Map; import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; diff --git a/src/com/android/server/NetworkStackService.java b/src/com/android/server/NetworkStackService.java index 9e5ed74..74a5da0 100644 --- a/src/com/android/server/NetworkStackService.java +++ b/src/com/android/server/NetworkStackService.java @@ -22,8 +22,6 @@ import static android.net.dhcp.IDhcpServer.STATUS_UNKNOWN_ERROR; import static com.android.server.util.PermissionUtil.checkDumpPermission; -import android.annotation.NonNull; -import android.annotation.Nullable; import android.app.Service; import android.content.Context; import android.content.Intent; @@ -49,6 +47,8 @@ import android.os.IBinder; import android.os.RemoteException; import android.util.ArraySet; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; import com.android.internal.annotations.GuardedBy; diff --git a/src/com/android/server/connectivity/NetworkMonitor.java b/src/com/android/server/connectivity/NetworkMonitor.java index e08170a..bda0c9a 100644 --- a/src/com/android/server/connectivity/NetworkMonitor.java +++ b/src/com/android/server/connectivity/NetworkMonitor.java @@ -68,8 +68,6 @@ import static android.provider.DeviceConfig.NAMESPACE_CONNECTIVITY; import static com.android.networkstack.util.DnsUtils.PRIVATE_DNS_PROBE_HOST_SUFFIX; import static com.android.networkstack.util.DnsUtils.TYPE_ADDRCONFIG; -import android.annotation.NonNull; -import android.annotation.Nullable; import android.app.PendingIntent; import android.content.BroadcastReceiver; import android.content.Context; @@ -115,6 +113,8 @@ import android.util.Log; import android.util.Pair; import androidx.annotation.ArrayRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.annotation.StringRes; import com.android.internal.annotations.VisibleForTesting; diff --git a/src/com/android/server/connectivity/ipmemorystore/IpMemoryStoreDatabase.java b/src/com/android/server/connectivity/ipmemorystore/IpMemoryStoreDatabase.java index 4896ef2..834aa2d 100644 --- a/src/com/android/server/connectivity/ipmemorystore/IpMemoryStoreDatabase.java +++ b/src/com/android/server/connectivity/ipmemorystore/IpMemoryStoreDatabase.java @@ -19,8 +19,6 @@ package com.android.server.connectivity.ipmemorystore; import static android.net.shared.Inet4AddressUtils.inet4AddressToIntHTH; import static android.net.shared.Inet4AddressUtils.intToInet4AddressHTH; -import android.annotation.NonNull; -import android.annotation.Nullable; import android.content.ContentValues; import android.content.Context; import android.database.Cursor; @@ -34,6 +32,9 @@ import android.net.ipmemorystore.NetworkAttributes; import android.net.ipmemorystore.Status; import android.util.Log; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.net.InetAddress; diff --git a/src/com/android/server/connectivity/ipmemorystore/IpMemoryStoreService.java b/src/com/android/server/connectivity/ipmemorystore/IpMemoryStoreService.java index 55ab8d4..8d57d61 100644 --- a/src/com/android/server/connectivity/ipmemorystore/IpMemoryStoreService.java +++ b/src/com/android/server/connectivity/ipmemorystore/IpMemoryStoreService.java @@ -24,8 +24,6 @@ import static android.net.ipmemorystore.Status.SUCCESS; import static com.android.server.connectivity.ipmemorystore.IpMemoryStoreDatabase.EXPIRY_ERROR; import static com.android.server.connectivity.ipmemorystore.RegularMaintenanceJobService.InterruptMaintenance; -import android.annotation.NonNull; -import android.annotation.Nullable; import android.content.Context; import android.database.SQLException; import android.database.sqlite.SQLiteDatabase; @@ -44,6 +42,9 @@ import android.net.ipmemorystore.StatusParcelable; import android.os.RemoteException; import android.util.Log; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.android.internal.annotations.VisibleForTesting; import java.io.File; diff --git a/src/com/android/server/connectivity/ipmemorystore/Utils.java b/src/com/android/server/connectivity/ipmemorystore/Utils.java index 9cbf490..d8a46ed 100644 --- a/src/com/android/server/connectivity/ipmemorystore/Utils.java +++ b/src/com/android/server/connectivity/ipmemorystore/Utils.java @@ -16,10 +16,11 @@ package com.android.server.connectivity.ipmemorystore; -import android.annotation.NonNull; -import android.annotation.Nullable; import android.net.ipmemorystore.Blob; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + /** {@hide} */ public class Utils { /** Pretty print */ |