Merge "Expose clearCapabilities for mainline module"

This commit is contained in:
Chiachang Wang
2020-01-08 10:25:08 +00:00
committed by Android (Google) Code Review
2 changed files with 2 additions and 2 deletions

View File

@@ -29481,6 +29481,7 @@ package android.net {
method public android.net.NetworkRequest.Builder addCapability(int);
method public android.net.NetworkRequest.Builder addTransportType(int);
method public android.net.NetworkRequest build();
method @NonNull public android.net.NetworkRequest.Builder clearCapabilities();
method public android.net.NetworkRequest.Builder removeCapability(int);
method public android.net.NetworkRequest.Builder removeTransportType(int);
method public android.net.NetworkRequest.Builder setNetworkSpecifier(String);

View File

@@ -247,9 +247,8 @@ public class NetworkRequest implements Parcelable {
* removing even the capabilities that are set by default when the object is constructed.
*
* @return The builder to facilitate chaining.
* @hide
*/
@UnsupportedAppUsage
@NonNull
public Builder clearCapabilities() {
mNetworkCapabilities.clearAll();
return this;