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

Merge "Assign the bit calculation as long to prevent overflow" am: 1122a53585 am: 7e2a559c57 am: a97e380d38

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

Change-Id: Ia3a1974227ebfd0069b288203df3551a561556eb
This commit is contained in:
Chiachang Wang
2021-04-07 06:06:50 +00:00
committed by Automerger Merge Worker
parent ec73c43fa0 a97e380d38
commit bb0f157fa3
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
framework/src/android/net/NetworkCapabilities.java
View File

@@ -600,8 +600,9 @@ public final class NetworkCapabilities implements Parcelable {
// TODO: Consider adding unwanted capabilities to the public API and mention this
// in the documentation.
checkValidCapability(capability);
mNetworkCapabilities |= 1 << capability;
mUnwantedNetworkCapabilities &= ~(1 << capability); // remove from unwanted capability list
mNetworkCapabilities |= 1L << capability;
// remove from unwanted capability list
mUnwantedNetworkCapabilities &= ~(1L << capability);
return this;
}
@@ -620,8 +621,8 @@ public final class NetworkCapabilities implements Parcelable {
*/
public void addUnwantedCapability(@NetCapability int capability) {
checkValidCapability(capability);
mUnwantedNetworkCapabilities |= 1 << capability;
mNetworkCapabilities &= ~(1 << capability); // remove from requested capabilities
mUnwantedNetworkCapabilities |= 1L << capability;
mNetworkCapabilities &= ~(1L << capability); // remove from requested capabilities
}
/**
@@ -634,7 +635,7 @@ public final class NetworkCapabilities implements Parcelable {
*/
public @NonNull NetworkCapabilities removeCapability(@NetCapability int capability) {
checkValidCapability(capability);
final long mask = ~(1 << capability);
final long mask = ~(1L << capability);
mNetworkCapabilities &= mask;
return this;
}
@@ -649,7 +650,7 @@ public final class NetworkCapabilities implements Parcelable {
*/
public @NonNull NetworkCapabilities removeUnwantedCapability(@NetCapability int capability) {
checkValidCapability(capability);
mUnwantedNetworkCapabilities &= ~(1 << capability);
mUnwantedNetworkCapabilities &= ~(1L << capability);
return this;
}
@@ -717,14 +718,14 @@ public final class NetworkCapabilities implements Parcelable {
*/
public boolean hasCapability(@NetCapability int capability) {
return isValidCapability(capability)
&& ((mNetworkCapabilities & (1 << capability)) != 0);
&& ((mNetworkCapabilities & (1L << capability)) != 0);
}
/** @hide */
@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
public boolean hasUnwantedCapability(@NetCapability int capability) {
return isValidCapability(capability)
&& ((mUnwantedNetworkCapabilities & (1 << capability)) != 0);
&& ((mUnwantedNetworkCapabilities & (1L << capability)) != 0);
}
/**