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

Commit 0bfecb60 authored by Pavel Maltsev's avatar Pavel Maltsev Committed by android-build-merger
Browse files

Merge "Remove unwanted capabilitiy from the java-doc" into pi-dev am: 1856d61f 

am: 1b8c42d1

Change-Id: Ib02988daf44dabfaef7a0b788385b7f7c655b8b2
parents 82298021 1b8c42d1

core/java/android/net/NetworkRequest.java

+1 −7
Original line number Diff line number Diff line
@@ -168,11 +168,6 @@ public class NetworkRequest implements Parcelable { 
         * the requested network's required capabilities.  Note that when searching

         * for a network to satisfy a request, all capabilities requested must be

         * satisfied.

         * <p>

         * If the given capability was previously added to the list of unwanted capabilities

         * then the capability will also be removed from the list of unwanted capabilities.

         *

         * @see #addUnwantedCapability(int)

         *

         * @param capability The capability to add.

         * @return The builder to facilitate chaining
@@ -184,8 +179,7 @@ public class NetworkRequest implements Parcelable { 
        }



        /**

         * Removes (if found) the given capability from this builder instance from both required

         * and unwanted capabilities lists.

         * Removes (if found) the given capability from this builder instance.

         *

         * @param capability The capability to remove.

         * @return The builder to facilitate chaining.