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

Commit 2b14c997 authored by Chiachang Wang's avatar Chiachang Wang
Browse files

Replace clearAll with withoutDefaultCapabilities 

As the feedback from API review, the clearAll method in Builder
does not match the actual usage. Thus, remove it and replace
with withoutDefaultCapabilities to provide clearer usage.

Bug: 184735772
Test: make update-api ; m
Change-Id: Ida8d25d57504864f046e3403f593cc606fbfe982
CTS-Coverage-Bug: 186061922
parent 6dbef56e

packages/Connectivity/framework/api/system-current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -296,7 +296,6 @@ package android.net { 
    method @NonNull public android.net.NetworkCapabilities.Builder addCapability(int);

    method @NonNull public android.net.NetworkCapabilities.Builder addCapability(int);

    method @NonNull public android.net.NetworkCapabilities.Builder addTransportType(int);

    method @NonNull public android.net.NetworkCapabilities.Builder addTransportType(int);

    method @NonNull public android.net.NetworkCapabilities build();

    method @NonNull public android.net.NetworkCapabilities build();

    method @NonNull public android.net.NetworkCapabilities.Builder clearAll();

    method @NonNull public android.net.NetworkCapabilities.Builder removeCapability(int);

    method @NonNull public android.net.NetworkCapabilities.Builder removeCapability(int);

    method @NonNull public android.net.NetworkCapabilities.Builder removeTransportType(int);

    method @NonNull public android.net.NetworkCapabilities.Builder removeTransportType(int);

    method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_FACTORY) public android.net.NetworkCapabilities.Builder setAdministratorUids(@NonNull int[]);

    method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_FACTORY) public android.net.NetworkCapabilities.Builder setAdministratorUids(@NonNull int[]);
@@ -310,6 +309,7 @@ package android.net { 
    method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_FACTORY) public android.net.NetworkCapabilities.Builder setSsid(@Nullable String);

    method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_FACTORY) public android.net.NetworkCapabilities.Builder setSsid(@Nullable String);

    method @NonNull public android.net.NetworkCapabilities.Builder setSubscriptionIds(@NonNull java.util.Set<java.lang.Integer>);

    method @NonNull public android.net.NetworkCapabilities.Builder setSubscriptionIds(@NonNull java.util.Set<java.lang.Integer>);

    method @NonNull public android.net.NetworkCapabilities.Builder setTransportInfo(@Nullable android.net.TransportInfo);

    method @NonNull public android.net.NetworkCapabilities.Builder setTransportInfo(@Nullable android.net.TransportInfo);

    method @NonNull public static android.net.NetworkCapabilities.Builder withoutDefaultCapabilities();

  }

  }





  public class NetworkProvider {

  public class NetworkProvider {

packages/Connectivity/framework/src/android/net/NetworkCapabilities.java

+15 −11
Original line number Original line Diff line number Diff line
@@ -2418,6 +2418,11 @@ public final class NetworkCapabilities implements Parcelable { 
        return mTransportInfo.getApplicableRedactions();

        return mTransportInfo.getApplicableRedactions();

    }

    }





    private NetworkCapabilities removeDefaultCapabilites() {

        mNetworkCapabilities &= ~DEFAULT_CAPABILITIES;

        return this;

    }



    /**

    /**

     * Builder class for NetworkCapabilities.

     * Builder class for NetworkCapabilities.

     *

     *
@@ -2453,6 +2458,16 @@ public final class NetworkCapabilities implements Parcelable { 
            mCaps = new NetworkCapabilities(nc);

            mCaps = new NetworkCapabilities(nc);

        }

        }





        /**

         * Creates a new Builder without the default capabilities.

         */

        @NonNull

        public static Builder withoutDefaultCapabilities() {

            final NetworkCapabilities nc = new NetworkCapabilities();

            nc.removeDefaultCapabilites();

            return new Builder(nc);

        }



        /**

        /**

         * Adds the given transport type.

         * Adds the given transport type.

         *

         *
@@ -2512,17 +2527,6 @@ public final class NetworkCapabilities implements Parcelable { 
            return this;

            return this;

        }

        }





        /**

         * Completely clears the contents of this object, removing even the capabilities that are

         * set by default when the object is constructed.

         * @return this builder

         */

        @NonNull

        public Builder clearAll() {

            mCaps.clearAll();

            return this;

        }



        /**

        /**

         * Sets the owner UID.

         * Sets the owner UID.

         *

         *