diff options
| author | Junyu Lai <junyulai@google.com> | 2021-01-13 11:50:11 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-13 11:50:11 +0000 |
| commit | a5dfc094fe5f37cc9b33a3809ca8d7fbb9bdccf5 (patch) | |
| tree | 2faa3a7d43a1a20bb4986d5a1b6854053408d98d /core/java/android | |
| parent | 982e50f2c6191d7aea5682c7cd0a97b309a680c7 (diff) | |
| parent | 075f097e827860f395b9e03b8c14e5c22772d953 (diff) | |
Merge "Align coding style of line-wrapping in NetworkCapabilities" am: 357893095f am: 075f097e82
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1529105
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I93eb38109e4c72375fb591af0828dac3da1255c7
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/net/NetworkCapabilities.java | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/core/java/android/net/NetworkCapabilities.java b/core/java/android/net/NetworkCapabilities.java index 85973293e63f..f36b85b2a6eb 100644 --- a/core/java/android/net/NetworkCapabilities.java +++ b/core/java/android/net/NetworkCapabilities.java @@ -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 |