LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Remove hidden @NetworkType in NetworkInfo"

Browse Source
This commit is contained in:
Treehugger Robot
2021-03-12 08:59:35 +00:00
committed by Gerrit Code Review
parent 122c15f5d5 d4a9ed4b1a
commit cd6324c135
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
framework/src/android/net/NetworkInfo.java
View File

@@ -21,7 +21,6 @@ import android.annotation.Nullable;
import android.compat.annotation.UnsupportedAppUsage; import android.compat.annotation.UnsupportedAppUsage;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.telephony.Annotation.NetworkType;
import android.text.TextUtils; import android.text.TextUtils;
import com.android.internal.annotations.VisibleForTesting; 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 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. * @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) { @Nullable String typeName, @Nullable String subtypeName) {
if (!ConnectivityManager.isNetworkTypeValid(type) if (!ConnectivityManager.isNetworkTypeValid(type)
&& type != ConnectivityManager.TYPE_NONE) { && type != ConnectivityManager.TYPE_NONE) {