diff options
| author | Frank <lifr@google.com> | 2022-01-27 22:15:46 +0800 |
|---|---|---|
| committer | Frank <lifr@google.com> | 2022-01-27 22:28:20 +0800 |
| commit | de9b4def5feecba5d26fa899d97c8f62d2397ab9 (patch) | |
| tree | 19724ecb8d4655879fec6020af10376faadc5dd0 /framework-t/src/android/net/NetworkIdentity.java | |
| parent | b68a9f0972d4871d18133ea06e27528d65fe962e (diff) | |
[DU12]Remove NetworkType Annotation
Bug: 216619447
Test: atest NetworkTemplateTest NetworkStatsCollectionTest
NetworkStatsSubscriptionsMonitorTest
Change-Id: I58689201a684f581a4b88df058a5e0683da61926
Diffstat (limited to 'framework-t/src/android/net/NetworkIdentity.java')
| -rw-r--r-- | framework-t/src/android/net/NetworkIdentity.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/framework-t/src/android/net/NetworkIdentity.java b/framework-t/src/android/net/NetworkIdentity.java index 73b9c72699..56faa52e82 100644 --- a/framework-t/src/android/net/NetworkIdentity.java +++ b/framework-t/src/android/net/NetworkIdentity.java @@ -30,7 +30,6 @@ import android.app.usage.NetworkStatsManager; import android.content.Context; import android.net.wifi.WifiInfo; import android.service.NetworkIdentityProto; -import android.telephony.Annotation; import android.telephony.TelephonyManager; import android.util.proto.ProtoOutputStream; @@ -275,8 +274,7 @@ public class NetworkIdentity { @Deprecated @NonNull public static NetworkIdentity buildNetworkIdentity(Context context, - @NonNull NetworkStateSnapshot snapshot, - boolean defaultNetwork, @Annotation.NetworkType int ratType) { + @NonNull NetworkStateSnapshot snapshot, boolean defaultNetwork, int ratType) { final NetworkIdentity.Builder builder = new NetworkIdentity.Builder() .setNetworkStateSnapshot(snapshot).setDefaultNetwork(defaultNetwork); if (snapshot.getLegacyType() == TYPE_MOBILE && ratType != NETWORK_TYPE_ALL) { @@ -433,7 +431,7 @@ public class NetworkIdentity { * @return this builder. */ @NonNull - public Builder setRatType(@Annotation.NetworkType int ratType) { + public Builder setRatType(int ratType) { if (!CollectionUtils.contains(TelephonyManager.getAllNetworkTypes(), ratType) && ratType != TelephonyManager.NETWORK_TYPE_UNKNOWN && ratType != NetworkStatsManager.NETWORK_TYPE_5G_NSA) { |