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"

Browse Source
This commit is contained in:
Junyu Lai
2021-01-13 10:40:43 +00:00
committed by Gerrit Code Review
parent fc16c8d944 fd20e05e1d
commit 12f7ddc06b
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 @VisibleForTesting
/* package */ static final long UNRESTRICTED_CAPABILITIES = /* package */ static final long UNRESTRICTED_CAPABILITIES =
(1 << NET_CAPABILITY_INTERNET) | (1 << NET_CAPABILITY_INTERNET)
(1 << NET_CAPABILITY_MMS) | | (1 << NET_CAPABILITY_MMS)
(1 << NET_CAPABILITY_SUPL) | | (1 << NET_CAPABILITY_SUPL)
(1 << NET_CAPABILITY_WIFI_P2P); | (1 << NET_CAPABILITY_WIFI_P2P);
/** /**
* Capabilities that are managed by ConnectivityService. * Capabilities that are managed by ConnectivityService.
@@ -925,8 +925,8 @@ public final class NetworkCapabilities implements Parcelable {
} }
private boolean satisfiedByTransportTypes(NetworkCapabilities nc) { private boolean satisfiedByTransportTypes(NetworkCapabilities nc) {
return ((this.mTransportTypes == 0) || return ((this.mTransportTypes == 0)
((this.mTransportTypes & nc.mTransportTypes) != 0)); || ((this.mTransportTypes & nc.mTransportTypes) != 0));
} }
/** @hide */ /** @hide */
@@ -1180,12 +1180,12 @@ public final class NetworkCapabilities implements Parcelable {
Math.max(this.mLinkDownBandwidthKbps, nc.mLinkDownBandwidthKbps); Math.max(this.mLinkDownBandwidthKbps, nc.mLinkDownBandwidthKbps);
} }
private boolean satisfiedByLinkBandwidths(NetworkCapabilities nc) { private boolean satisfiedByLinkBandwidths(NetworkCapabilities nc) {
return !(this.mLinkUpBandwidthKbps > nc.mLinkUpBandwidthKbps || return !(this.mLinkUpBandwidthKbps > nc.mLinkUpBandwidthKbps
this.mLinkDownBandwidthKbps > nc.mLinkDownBandwidthKbps); || this.mLinkDownBandwidthKbps > nc.mLinkDownBandwidthKbps);
} }
private boolean equalsLinkBandwidths(NetworkCapabilities nc) { private boolean equalsLinkBandwidths(NetworkCapabilities nc) {
return (this.mLinkUpBandwidthKbps == nc.mLinkUpBandwidthKbps && return (this.mLinkUpBandwidthKbps == nc.mLinkUpBandwidthKbps
this.mLinkDownBandwidthKbps == nc.mLinkDownBandwidthKbps); && this.mLinkDownBandwidthKbps == nc.mLinkDownBandwidthKbps);
} }
/** @hide */ /** @hide */
public static int minBandwidth(int a, int b) { public static int minBandwidth(int a, int b) {
@@ -1700,9 +1700,9 @@ public final class NetworkCapabilities implements Parcelable {
*/ */
public boolean equalRequestableCapabilities(@Nullable NetworkCapabilities nc) { public boolean equalRequestableCapabilities(@Nullable NetworkCapabilities nc) {
if (nc == null) return false; if (nc == null) return false;
return (equalsNetCapabilitiesRequestable(nc) && return (equalsNetCapabilitiesRequestable(nc)
equalsTransportTypes(nc) && && equalsTransportTypes(nc)
equalsSpecifier(nc)); && equalsSpecifier(nc));
} }
@Override @Override