Merge "Replace clearAll with withoutDefaultCapabilities" (86a1c27f) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -294,7 +294,6 @@ package android.net {
		method @NonNull public android.net.NetworkCapabilities.Builder addCapability(int);
		method @NonNull public android.net.NetworkCapabilities.Builder addTransportType(int);
		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 removeTransportType(int);
		method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_FACTORY) public android.net.NetworkCapabilities.Builder setAdministratorUids(@NonNull int[]);
		@@ -308,6 +307,7 @@ package android.net {
		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 setTransportInfo(@Nullable android.net.TransportInfo);
		method @NonNull public static android.net.NetworkCapabilities.Builder withoutDefaultCapabilities();
		}

		public class NetworkProvider {

+15 −11

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

		private NetworkCapabilities removeDefaultCapabilites() {
		mNetworkCapabilities &= ~DEFAULT_CAPABILITIES;
		return this;
		}

		/**
		* Builder class for NetworkCapabilities.
		*
		@@ -2434,6 +2439,16 @@ public final class NetworkCapabilities implements Parcelable {
		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.
		*
		@@ -2494,17 +2509,6 @@ public final class NetworkCapabilities implements Parcelable {
		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.
		*