Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bde15c3c authored by Chiachang Wang's avatar Chiachang Wang Committed by Android (Google) Code Review
Browse files

Merge "Expose clearCapabilities for mainline module"

parents ba9707e9 c1af0504

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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);

core/java/android/net/NetworkRequest.java

+1 −2
Original line number Diff line number Diff line
@@ -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;