joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Remove hidden @NetworkType in NetworkInfo" am: e01042965a

Browse source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628359

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie8cdd5f7eec86f8bc882f70dbc7480a0c0669358
This commit is contained in:
Treehugger Robot 2021-03-12 09:27:20 +00:00 • committed by Automerger Merge Worker
commit 19feee80d0
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.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) {