diff options
| author | 2021-03-12 10:00:39 +0000 | |
|---|---|---|
| committer | 2021-03-12 10:00:39 +0000 | |
| commit | b618bb7728733c8bbe796c83da9f3cb905a084e1 (patch) | |
| tree | c0fb9eab72b40503fba69ecc155f5cf9702059a3 | |
| parent | 2e5256b1a2976be44adbe5c2d758a79bc1ba2f56 (diff) | |
| parent | 09702cc4057faebb0a049c14faf3831c5a2afd8c (diff) | |
Merge "Remove hidden @NetworkType in NetworkInfo" am: a247ffeaad am: 09702cc405
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628359
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I888dc544595c7b5b085ea70e609cacdd6c526591
| -rw-r--r-- | packages/Connectivity/framework/src/android/net/NetworkInfo.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/packages/Connectivity/framework/src/android/net/NetworkInfo.java b/packages/Connectivity/framework/src/android/net/NetworkInfo.java index d752901e2eb0..bb2349459331 100644 --- a/packages/Connectivity/framework/src/android/net/NetworkInfo.java +++ b/packages/Connectivity/framework/src/android/net/NetworkInfo.java @@ -21,7 +21,6 @@ import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; -import android.telephony.Annotation.NetworkType; import android.text.TextUtils; import com.android.internal.annotations.VisibleForTesting; @@ -164,7 +163,7 @@ public class NetworkInfo implements Parcelable { * @param typeName a human-readable string for the network type, or an empty string or null. * @param subtypeName a human-readable string for the subtype, or an empty string or null. */ - public NetworkInfo(int type, @NetworkType int subtype, + public NetworkInfo(int type, int subtype, @Nullable String typeName, @Nullable String subtypeName) { if (!ConnectivityManager.isNetworkTypeValid(type) && type != ConnectivityManager.TYPE_NONE) { |