Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add NetworkRequest#satisfiedBy to SystemApi"

Browse Source 
am: b8f9c4f5b2

Change-Id: I817020ac31dec9e10ea27fa38f07250f5c447de1
This commit is contained in:
Remi NGUYEN VAN
2020-01-21 06:21:11 -08:00
committed by android-build-merger
parent 709c6fb8a9 b8f9c4f5b2
commit 938f330d63
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/system-current.txt
View File

@@ -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
core/java/android/net/NetworkRequest.java
View File

@@ -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)
*/ */