Merge "Remove unused buildNetworkIdentity" am: f182642b86 am: 1f23e82e55
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622670 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6517777a7a2922d1d7cee0fabe4dbe2cd286800c
This commit is contained in:
@@ -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.
|
||||||
|
|||||||
Reference in New Issue
Block a user