Merge "Align coding style of line-wrapping in NetworkCapabilities" (35789309) · Commits · e / os / android_frameworks_base

core/java/android/net/NetworkCapabilities.java

+13 −13

Original line number	Diff line number	Diff line
		@@ -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