Merge changes I6260695b,I88f00ca4 am: db9335b832 am: 637ea71e2c

Change-Id: I8d44be12a15d33db6fec6556bf9494ad60fa4c59
This commit is contained in:
Automerger Merge Worker
2020-01-09 04:22:26 +00:00

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. * removing even the capabilities that are set by default when the object is constructed.
* *
* @return The builder to facilitate chaining. * @return The builder to facilitate chaining.
* @hide
*/ */
@UnsupportedAppUsage @NonNull
public Builder clearCapabilities() { public Builder clearCapabilities() {
mNetworkCapabilities.clearAll(); mNetworkCapabilities.clearAll();
return this; return this;