Merge "Remove unused buildNetworkIdentity" am: f182642b86 am: 1f23e82e55 am: 37ee901d2a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622670 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifd1c5f5fc46131f6e5b586b76505e7f666547e96
This commit is contained in:
@@ -178,21 +178,6 @@ public class NetworkIdentity implements Comparable<NetworkIdentity> {
|
||||
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
|
||||
* {@code subType}, assuming that any mobile networks are using the current IMSI.
|
||||
|
||||
Reference in New Issue
Block a user