Merge "Add NetworkRequest#satisfiedBy to SystemApi" (938f330d) · Commits · e / os / android_frameworks_base

api/system-current.txt

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -4507,6 +4507,10 @@ package android.net {
	method public abstract void onRequestScores(android.net.NetworkKey[]);		method public abstract void onRequestScores(android.net.NetworkKey[]);
	}		}

			public class NetworkRequest implements android.os.Parcelable {
			method public boolean satisfiedBy(@Nullable android.net.NetworkCapabilities);
			}

	public static class NetworkRequest.Builder {		public static class NetworkRequest.Builder {
	method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_SIGNAL_STRENGTH_WAKEUP) public android.net.NetworkRequest.Builder setSignalStrength(int);		method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_SIGNAL_STRENGTH_WAKEUP) public android.net.NetworkRequest.Builder setSignalStrength(int);
	}		}

+13 −0

Original line number	Original line	Diff line number	Diff line
	@@ -466,6 +466,19 @@ public class NetworkRequest implements Parcelable {
	return networkCapabilities.hasUnwantedCapability(capability);		return networkCapabilities.hasUnwantedCapability(capability);
	}		}

			/**
			* Returns true iff. the capabilities requested in this NetworkRequest are satisfied by the
			* provided {@link NetworkCapabilities}.
			*
			* @param nc Capabilities that should satisfy this NetworkRequest. null capabilities do not
			* satisfy any request.
			* @hide
			*/
			@SystemApi
			public boolean satisfiedBy(@Nullable NetworkCapabilities nc) {
			return networkCapabilities.satisfiedByNetworkCapabilities(nc);
			}

	/**		/**
	* @see Builder#addTransportType(int)		* @see Builder#addTransportType(int)
	*/		*/