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/com/android/server/NetworkStackService.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/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; |