diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2019-09-12 14:39:24 +0900 |
|---|---|---|
| committer | Remi NGUYEN VAN <reminv@google.com> | 2019-10-30 09:41:39 +0000 |
| commit | 87790c2509201f3d93fa2c4244102b22b9d37430 (patch) | |
| tree | 86787b17b763399f334cb75fb8234494398ca405 /src/android/net/dhcp/DhcpClient.java | |
| parent | 5f48efe6935a3823099b48a46bee0217b10a1bb3 (diff) | |
Remove hidden annotation usage from NetworkStack
NetworkStack uses hidden android.annotation.* annotations by pulling the
source files from frameworks/base. This should not be necessary, since
androidx annotations can be used instead.
Remove usage of such annotations and replace with androidx annotations.
Test: m NetworkStack NetworkStackApiStable
Test: builds, boots, WiFi working
Bug: 139105333
Change-Id: I24e147ac4f01feaf53424430b4825b316ec154fe
Diffstat (limited to 'src/android/net/dhcp/DhcpClient.java')
| -rw-r--r-- | src/android/net/dhcp/DhcpClient.java | 5 |
1 files changed, 3 insertions, 2 deletions
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; |