commit f829e86db8c4405f3cdcc5e7d865c79e5131f325
author Treehugger Robot <treehugger-gerrit@google.com> Fri Mar 12 08:59:35 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 12 08:59:35 2021 +0000
tree 350a9fd26c6eb5687cb52b06008cb94982d000cd
parent 31558edb8e59d361557e01a5271437d3545fade6
parent 4c63bb2e8640d638b82e11be4252a0edb4dda2dd

Merge "Remove hidden @NetworkType in NetworkInfo"

framework/src/android/net/NetworkInfo.java

diff --git a/framework/src/android/net/NetworkInfo.java b/framework/src/android/net/NetworkInfo.java
index d752901..bb23494 100644
--- a/framework/src/android/net/NetworkInfo.java
+++ b/framework/src/android/net/NetworkInfo.java
@@ -21,7 +21,6 @@
 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 @@
      * @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) {