diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2019-10-31 05:17:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-10-31 05:17:38 +0000 |
| commit | c132c5c2c6c78460a668e0044d077d40a3760eca (patch) | |
| tree | cffe73deafb0584ac98ed47fb9e6e12451fa8dbd /src/android/net/dhcp/DhcpClient.java | |
| parent | 940b8967b3763c05fc573d9f02c1cf3060e34c49 (diff) | |
| parent | 87790c2509201f3d93fa2c4244102b22b9d37430 (diff) | |
Merge "Remove hidden annotation usage from NetworkStack"
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 2a0a1d2..0d56d63 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; |