Merge changes I6260695b,I88f00ca4

am: db9335b832

Change-Id: I550cb7e14d6c9f21a3d87073bcf692e387857cba
This commit is contained in:
Chiachang Wang
2020-01-08 20:03:33 -08:00
committed by android-build-merger

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;