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

Commit b61beb57 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Automerger Merge Worker
Browse files

Merge "Remove unused buildNetworkIdentity" am: f182642b am: eef71ecf 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6517777a7a2922d1d7cee0fabe4dbe2cd286800c
parents d2cd30f2 eef71ecf

core/java/android/net/NetworkIdentity.java

+0 −15
Original line number Original line Diff line number Diff line
@@ -178,21 +178,6 @@ public class NetworkIdentity implements Comparable<NetworkIdentity> { 
        return mOemManaged;

        return mOemManaged;

    }

    }





    /**

     * Build a {@link NetworkIdentity} from the given {@link NetworkState} and

     * {@code subType}, assuming that any mobile networks are using the current IMSI.

     * The subType if applicable, should be set as one of the TelephonyManager.NETWORK_TYPE_*

     * constants, or {@link android.telephony.TelephonyManager#NETWORK_TYPE_UNKNOWN} if not.

     */

    // TODO: Delete this function after NetworkPolicyManagerService finishes the migration.

    public static NetworkIdentity buildNetworkIdentity(Context context,

            NetworkState state, boolean defaultNetwork, @NetworkType int subType) {

        final NetworkStateSnapshot snapshot = new NetworkStateSnapshot(state.network,

                state.networkCapabilities, state.linkProperties, state.subscriberId,

                state.legacyNetworkType);

        return buildNetworkIdentity(context, snapshot, defaultNetwork, subType);

    }



    /**

    /**

     * Build a {@link NetworkIdentity} from the given {@link NetworkStateSnapshot} and

     * Build a {@link NetworkIdentity} from the given {@link NetworkStateSnapshot} and

     * {@code subType}, assuming that any mobile networks are using the current IMSI.

     * {@code subType}, assuming that any mobile networks are using the current IMSI.