joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

NetworkCapabilities: initialize ALL_VALID_CAPABILITIES without loop

Browse source 
This change also removes the MIN_NET_CAPABILITY constant that is not
actually used and can always be re-added in the future (though, I would
imagine that NetworkCapabilities will not be deprecated / removed in
numerical order).

Test: TH
Change-Id: I97ccbc9e915eb74a0ef52c576e16fc8ce8d5b646
This commit is contained in:
Patrick Rohr 2023-07-19 14:18:16 -07:00
commit 7a042d869f
1 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
framework/src/android/net/NetworkCapabilities.java
View file

@ -690,17 +690,10 @@ public final class NetworkCapabilities implements Parcelable {
*/
public static final int NET_CAPABILITY_PRIORITIZE_BANDWIDTH = 35;
private static final int MIN_NET_CAPABILITY = NET_CAPABILITY_MMS;
private static final int MAX_NET_CAPABILITY = NET_CAPABILITY_PRIORITIZE_BANDWIDTH;
private static final long ALL_VALID_CAPABILITIES;
static {
long caps = 0;
for (int i = MIN_NET_CAPABILITY; i <= MAX_NET_CAPABILITY; ++i) {
caps |= 1L << i;
}
ALL_VALID_CAPABILITIES = caps;
}
// Set all bits up to the MAX_NET_CAPABILITY-th bit
private static final long ALL_VALID_CAPABILITIES = (2L << MAX_NET_CAPABILITY) - 1;
/**
* Network capabilities that are expected to be mutable, i.e., can change while a particular
@ -2519,7 +2512,7 @@ public final class NetworkCapabilities implements Parcelable {
}
private static boolean isValidCapability(@NetworkCapabilities.NetCapability int capability) {
return capability >= MIN_NET_CAPABILITY && capability <= MAX_NET_CAPABILITY;
return capability >= 0 && capability <= MAX_NET_CAPABILITY;
}
private static void checkValidCapability(@NetworkCapabilities.NetCapability int capability) {