Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bdc1772e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove hidden @NetworkType in NetworkInfo" am: a247ffea am: 09702cc4 am: b618bb77 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4868ba91efd24c4544dc6ce044e1b76d50c1a611
parents 387a5dd7 b618bb77

packages/Connectivity/framework/src/android/net/NetworkInfo.java

+1 −2
Original line number Diff line number Diff line
@@ -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) {