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

Merge "Align coding style of line-wrapping in NetworkCapabilities" am: 12f7ddc06b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5e1146c6e374a0e7b31d8a8615545f4486fcd4ba
This commit is contained in:
Junyu Lai
2021-01-13 11:32:40 +00:00
committed by Automerger Merge Worker
parent eb694c2613 12f7ddc06b
commit b2fe002fba
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
core/java/android/net/NetworkCapabilities.java
View File

@@ -453,10 +453,10 @@ public final class NetworkCapabilities implements Parcelable {
*/
@VisibleForTesting
/* package */ static final long UNRESTRICTED_CAPABILITIES =
(1 << NET_CAPABILITY_INTERNET) |
(1 << NET_CAPABILITY_MMS) |
(1 << NET_CAPABILITY_SUPL) |
(1 << NET_CAPABILITY_WIFI_P2P);
(1 << NET_CAPABILITY_INTERNET)
| (1 << NET_CAPABILITY_MMS)
| (1 << NET_CAPABILITY_SUPL)
| (1 << NET_CAPABILITY_WIFI_P2P);
/**
* Capabilities that are managed by ConnectivityService.
@@ -925,8 +925,8 @@ public final class NetworkCapabilities implements Parcelable {
}
private boolean satisfiedByTransportTypes(NetworkCapabilities nc) {
return ((this.mTransportTypes == 0) ||
((this.mTransportTypes & nc.mTransportTypes) != 0));
return ((this.mTransportTypes == 0)
|| ((this.mTransportTypes & nc.mTransportTypes) != 0));
}
/** @hide */
@@ -1180,12 +1180,12 @@ public final class NetworkCapabilities implements Parcelable {
Math.max(this.mLinkDownBandwidthKbps, nc.mLinkDownBandwidthKbps);
}
private boolean satisfiedByLinkBandwidths(NetworkCapabilities nc) {
return !(this.mLinkUpBandwidthKbps > nc.mLinkUpBandwidthKbps ||
this.mLinkDownBandwidthKbps > nc.mLinkDownBandwidthKbps);
return !(this.mLinkUpBandwidthKbps > nc.mLinkUpBandwidthKbps
|| this.mLinkDownBandwidthKbps > nc.mLinkDownBandwidthKbps);
}
private boolean equalsLinkBandwidths(NetworkCapabilities nc) {
return (this.mLinkUpBandwidthKbps == nc.mLinkUpBandwidthKbps &&
this.mLinkDownBandwidthKbps == nc.mLinkDownBandwidthKbps);
return (this.mLinkUpBandwidthKbps == nc.mLinkUpBandwidthKbps
&& this.mLinkDownBandwidthKbps == nc.mLinkDownBandwidthKbps);
}
/** @hide */
public static int minBandwidth(int a, int b) {
@@ -1700,9 +1700,9 @@ public final class NetworkCapabilities implements Parcelable {
*/
public boolean equalRequestableCapabilities(@Nullable NetworkCapabilities nc) {
if (nc == null) return false;
return (equalsNetCapabilitiesRequestable(nc) &&
equalsTransportTypes(nc) &&
equalsSpecifier(nc));
return (equalsNetCapabilitiesRequestable(nc)
&& equalsTransportTypes(nc)
&& equalsSpecifier(nc));
}
@Override