Merge "API council requested tweaks to NetworkRequest." into pi-dev am: e6b1a7804d (053b1178) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -27242,6 +27242,8 @@ package android.net {

		public class NetworkRequest implements android.os.Parcelable {
		method public int describeContents();
		method public boolean hasCapability(int);
		method public boolean hasTransport(int);
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.net.NetworkRequest> CREATOR;
		}

+16 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,8 @@
		package android.net;

		import android.annotation.NonNull;
		import android.net.NetworkCapabilities.NetCapability;
		import android.net.NetworkCapabilities.Transport;
		import android.os.Parcel;
		import android.os.Parcelable;
		import android.os.Process;
		@@ -427,6 +429,20 @@ public class NetworkRequest implements Parcelable {
		return type == Type.BACKGROUND_REQUEST;
		}

		/**
		* @see Builder#addCapability(int)
		*/
		public boolean hasCapability(@NetCapability int capability) {
		return networkCapabilities.hasCapability(capability);
		}

		/**
		* @see Builder#addTransportType(int)
		*/
		public boolean hasTransport(@Transport int transportType) {
		return networkCapabilities.hasTransport(transportType);
		}

		public String toString() {
		return "NetworkRequest [ " + type + " id=" + requestId +
		(legacyType != ConnectivityManager.TYPE_NONE ? ", legacyType=" + legacyType : "") +