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/NetworkObserverRegistry.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/NetworkObserverRegistry.java')
| -rw-r--r-- | src/com/android/server/NetworkObserverRegistry.java | 3 |
1 files changed, 2 insertions, 1 deletions
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; |