Merge changes from topics "api-fix-networkagent", "networkprovider_api",... (638533bd) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -30343,11 +30343,11 @@ package android.net {
		}

		public class NetworkRequest implements android.os.Parcelable {
		method public boolean canBeSatisfiedBy(@Nullable android.net.NetworkCapabilities);
		method public int describeContents();
		method @Nullable public android.net.NetworkSpecifier getNetworkSpecifier();
		method public boolean hasCapability(int);
		method public boolean hasTransport(int);
		method public boolean satisfiedBy(@Nullable android.net.NetworkCapabilities);
		method public void writeToParcel(android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.net.NetworkRequest> CREATOR;
		}

api/system-current.txt

+1 −14

Original line number	Diff line number	Diff line
		@@ -6177,7 +6177,6 @@ package android.net {
		public final class MatchAllNetworkSpecifier extends android.net.NetworkSpecifier implements android.os.Parcelable {
		ctor public MatchAllNetworkSpecifier();
		method public int describeContents();
		method public boolean satisfiedBy(android.net.NetworkSpecifier);
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.net.MatchAllNetworkSpecifier> CREATOR;
		}
		@@ -6331,8 +6330,8 @@ package android.net {
		}

		public abstract class NetworkSpecifier {
		method public boolean canBeSatisfiedBy(@Nullable android.net.NetworkSpecifier);
		method @Nullable public android.net.NetworkSpecifier redact();
		method public abstract boolean satisfiedBy(@Nullable android.net.NetworkSpecifier);
		}

		public class NetworkStack {
		@@ -6435,10 +6434,6 @@ package android.net {
		method @NonNull public android.net.StaticIpConfiguration.Builder setIpAddress(@Nullable android.net.LinkAddress);
		}

		public final class TelephonyNetworkSpecifier extends android.net.NetworkSpecifier implements android.os.Parcelable {
		method public boolean satisfiedBy(android.net.NetworkSpecifier);
		}

		public final class TetheredClient implements android.os.Parcelable {
		ctor public TetheredClient(@NonNull android.net.MacAddress, @NonNull java.util.Collection<android.net.TetheredClient.AddressInfo>, int);
		method public int describeContents();
		@@ -7425,10 +7420,6 @@ package android.net.wifi {
		field public int numUsage;
		}

		public final class WifiNetworkSpecifier extends android.net.NetworkSpecifier implements android.os.Parcelable {
		method public boolean satisfiedBy(android.net.NetworkSpecifier);
		}

		public final class WifiNetworkSuggestion implements android.os.Parcelable {
		method @NonNull public android.net.wifi.WifiConfiguration getWifiConfiguration();
		}
		@@ -7619,10 +7610,6 @@ package android.net.wifi.aware {
		method @Deprecated public android.net.NetworkSpecifier createNetworkSpecifierPmk(@NonNull android.net.wifi.aware.PeerHandle, @NonNull byte[]);
		}

		public final class WifiAwareNetworkSpecifier extends android.net.NetworkSpecifier implements android.os.Parcelable {
		method public boolean satisfiedBy(android.net.NetworkSpecifier);
		}

		public class WifiAwareSession implements java.lang.AutoCloseable {
		method public android.net.NetworkSpecifier createNetworkSpecifierPmk(int, @NonNull byte[], @NonNull byte[]);
		}

core/java/android/net/NetworkCapabilities.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1122,7 +1122,7 @@ public final class NetworkCapabilities implements Parcelable {
		}

		private boolean satisfiedBySpecifier(NetworkCapabilities nc) {
		return mNetworkSpecifier == null \|\| mNetworkSpecifier.satisfiedBy(nc.mNetworkSpecifier)
		return mNetworkSpecifier == null \|\| mNetworkSpecifier.canBeSatisfiedBy(nc.mNetworkSpecifier)
		\|\| nc.mNetworkSpecifier instanceof MatchAllNetworkSpecifier;
		}

core/java/android/net/NetworkRequest.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -474,7 +474,7 @@ public class NetworkRequest implements Parcelable {
		* @param nc Capabilities that should satisfy this NetworkRequest. null capabilities do not
		* satisfy any request.
		*/
		public boolean satisfiedBy(@Nullable NetworkCapabilities nc) {
		public boolean canBeSatisfiedBy(@Nullable NetworkCapabilities nc) {
		return networkCapabilities.satisfiedByNetworkCapabilities(nc);
		}

core/java/android/net/NetworkSpecifier.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -35,7 +35,9 @@ public abstract class NetworkSpecifier {
		* @hide
		*/
		@SystemApi
		public abstract boolean satisfiedBy(@Nullable NetworkSpecifier other);
		public boolean canBeSatisfiedBy(@Nullable NetworkSpecifier other) {
		return false;
		}

		/**
		* Optional method which can be overridden by concrete implementations of NetworkSpecifier to