LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "[MS15.1] Remove get/setSubscriberIdMatchRule dependencies" am: c71df46649 am: 2ed1eefdf8

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

Change-Id: I6336d13c19ad2e7089e68ba30b1da38df957a35d
This commit is contained in:
Junyu Lai
2021-12-23 02:00:10 +00:00
committed by Automerger Merge Worker
parent 5ec3630cd3 2ed1eefdf8
commit 3a19cdee2e
1 changed files with 15 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
framework-t/src/android/net/NetworkTemplate.java
View File

@@ -51,6 +51,7 @@ import android.util.ArraySet;
import com.android.internal.util.ArrayUtils;
import com.android.net.module.util.NetworkIdentityUtils;
import com.android.net.module.util.NetworkStatsUtils;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -114,27 +115,6 @@ public final class NetworkTemplate implements Parcelable {
*/
public static final int MATCH_CARRIER = 10;
/** @hide */
@Retention(RetentionPolicy.SOURCE)
@IntDef(prefix = { "SUBSCRIBER_ID_MATCH_RULE_" }, value = {
SUBSCRIBER_ID_MATCH_RULE_EXACT,
SUBSCRIBER_ID_MATCH_RULE_ALL
})
public @interface SubscriberIdMatchRule{}
/**
* Value of the match rule of the subscriberId to match networks with specific subscriberId.
*
* @hide
*/
public static final int SUBSCRIBER_ID_MATCH_RULE_EXACT = 0;
/**
* Value of the match rule of the subscriberId to match networks with any subscriberId which
* includes null and non-null.
*
* @hide
*/
public static final int SUBSCRIBER_ID_MATCH_RULE_ALL = 1;
// TODO: Remove this and replace all callers with WIFI_NETWORK_KEY_ALL.
/** @hide */
public static final String WIFI_NETWORKID_ALL = null;
@@ -235,11 +215,11 @@ public final class NetworkTemplate implements Parcelable {
if (TextUtils.isEmpty(subscriberId)) {
return new NetworkTemplate(MATCH_MOBILE_WILDCARD, null, null, null,
metered, ROAMING_ALL, DEFAULT_NETWORK_ALL, ratType, OEM_MANAGED_ALL,
SUBSCRIBER_ID_MATCH_RULE_EXACT);
NetworkStatsUtils.SUBSCRIBER_ID_MATCH_RULE_EXACT);
}
return new NetworkTemplate(MATCH_MOBILE, subscriberId, new String[]{subscriberId}, null,
metered, ROAMING_ALL, DEFAULT_NETWORK_ALL, ratType, OEM_MANAGED_ALL,
SUBSCRIBER_ID_MATCH_RULE_EXACT);
NetworkStatsUtils.SUBSCRIBER_ID_MATCH_RULE_EXACT);
}
/**
@@ -285,7 +265,7 @@ public final class NetworkTemplate implements Parcelable {
new String[] { null } /* matchSubscriberIds */,
networkId, METERED_ALL, ROAMING_ALL,
DEFAULT_NETWORK_ALL, NETWORK_TYPE_ALL, OEM_MANAGED_ALL,
SUBSCRIBER_ID_MATCH_RULE_ALL);
NetworkStatsUtils.SUBSCRIBER_ID_MATCH_RULE_ALL);
}
/**
@@ -302,7 +282,7 @@ public final class NetworkTemplate implements Parcelable {
return new NetworkTemplate(MATCH_WIFI, subscriberId, new String[] { subscriberId },
networkId, METERED_ALL, ROAMING_ALL,
DEFAULT_NETWORK_ALL, NETWORK_TYPE_ALL, OEM_MANAGED_ALL,
SUBSCRIBER_ID_MATCH_RULE_EXACT);
NetworkStatsUtils.SUBSCRIBER_ID_MATCH_RULE_EXACT);
}
/**
@@ -346,7 +326,7 @@ public final class NetworkTemplate implements Parcelable {
return new NetworkTemplate(MATCH_CARRIER, subscriberId,
new String[] { subscriberId }, null /* networkId */, METERED_YES, ROAMING_ALL,
DEFAULT_NETWORK_ALL, NETWORK_TYPE_ALL, OEM_MANAGED_ALL,
SUBSCRIBER_ID_MATCH_RULE_EXACT);
NetworkStatsUtils.SUBSCRIBER_ID_MATCH_RULE_EXACT);
}
private final int mMatchRule;
@@ -384,7 +364,7 @@ public final class NetworkTemplate implements Parcelable {
case MATCH_MOBILE:
case MATCH_CARRIER:
// MOBILE and CARRIER templates must always specify a subscriber ID.
if (subscriberIdMatchRule == SUBSCRIBER_ID_MATCH_RULE_ALL) {
if (subscriberIdMatchRule == NetworkStatsUtils.SUBSCRIBER_ID_MATCH_RULE_ALL) {
throw new IllegalArgumentException("Invalid SubscriberIdMatchRule "
+ "on match rule: " + getMatchRuleName(matchRule));
}
@@ -411,7 +391,7 @@ public final class NetworkTemplate implements Parcelable {
this(matchRule, subscriberId, matchSubscriberIds, networkId,
(matchRule == MATCH_MOBILE || matchRule == MATCH_MOBILE_WILDCARD) ? METERED_YES
: METERED_ALL , ROAMING_ALL, DEFAULT_NETWORK_ALL, NETWORK_TYPE_ALL,
OEM_MANAGED_ALL, SUBSCRIBER_ID_MATCH_RULE_EXACT);
OEM_MANAGED_ALL, NetworkStatsUtils.SUBSCRIBER_ID_MATCH_RULE_EXACT);
}
/** @hide */
@@ -420,7 +400,8 @@ public final class NetworkTemplate implements Parcelable {
String networkId, int metered, int roaming, int defaultNetwork, int subType,
int oemManaged) {
this(matchRule, subscriberId, matchSubscriberIds, networkId, metered, roaming,
defaultNetwork, subType, oemManaged, SUBSCRIBER_ID_MATCH_RULE_EXACT);
defaultNetwork, subType, oemManaged,
NetworkStatsUtils.SUBSCRIBER_ID_MATCH_RULE_EXACT);
}
/** @hide */
@@ -539,9 +520,9 @@ public final class NetworkTemplate implements Parcelable {
private static String subscriberIdMatchRuleToString(int rule) {
switch (rule) {
case SUBSCRIBER_ID_MATCH_RULE_EXACT:
case NetworkStatsUtils.SUBSCRIBER_ID_MATCH_RULE_EXACT:
return "EXACT_MATCH";
case SUBSCRIBER_ID_MATCH_RULE_ALL:
case NetworkStatsUtils.SUBSCRIBER_ID_MATCH_RULE_ALL:
return "ALL";
default:
return "Unknown rule " + rule;
@@ -608,15 +589,6 @@ public final class NetworkTemplate implements Parcelable {
return mNetworkId;
}
/**
* Get Subscriber Id Match Rule of the template.
*
* @hide
*/
public int getSubscriberIdMatchRule() {
return mSubscriberIdMatchRule;
}
/**
* Get meteredness filter of the template.
*/
@@ -730,7 +702,7 @@ public final class NetworkTemplate implements Parcelable {
* @hide
*/
public boolean matchesSubscriberId(@Nullable String subscriberId) {
return mSubscriberIdMatchRule == SUBSCRIBER_ID_MATCH_RULE_ALL
return mSubscriberIdMatchRule == NetworkStatsUtils.SUBSCRIBER_ID_MATCH_RULE_ALL
|| ArrayUtils.contains(mMatchSubscriberIds, subscriberId);
}
@@ -1176,7 +1148,8 @@ public final class NetworkTemplate implements Parcelable {
public NetworkTemplate build() {
assertRequestableParameters();
final int subscriberIdMatchRule = mMatchSubscriberIds.isEmpty()
? SUBSCRIBER_ID_MATCH_RULE_ALL : SUBSCRIBER_ID_MATCH_RULE_EXACT;
? NetworkStatsUtils.SUBSCRIBER_ID_MATCH_RULE_ALL
: NetworkStatsUtils.SUBSCRIBER_ID_MATCH_RULE_EXACT;
return new NetworkTemplate(getWildcardDeducedMatchRule(),
mMatchSubscriberIds.isEmpty() ? null : mMatchSubscriberIds.iterator().next(),
mMatchSubscriberIds.toArray(new String[0]),