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/com/android/server/NetworkStackService.java | |
| parent | 940b8967b3763c05fc573d9f02c1cf3060e34c49 (diff) | |
| parent | 87790c2509201f3d93fa2c4244102b22b9d37430 (diff) | |
Merge "Remove hidden annotation usage from NetworkStack"
Diffstat (limited to 'src/com/android/server/NetworkStackService.java')
| -rw-r--r-- | src/com/android/server/NetworkStackService.java | 4 |
1 files changed, 2 insertions, 2 deletions
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; |