Merge "API council requested tweaks to NetworkRequest." into pi-dev

This commit is contained in:
Jeff Sharkey
2018-03-30 16:30:24 +00:00
committed by Android (Google) Code Review

View File

@@ -17,6 +17,8 @@
package android.net; package android.net;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.net.NetworkCapabilities.NetCapability;
import android.net.NetworkCapabilities.Transport;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.os.Process; import android.os.Process;
@@ -427,6 +429,20 @@ public class NetworkRequest implements Parcelable {
return type == Type.BACKGROUND_REQUEST; 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() { public String toString() {
return "NetworkRequest [ " + type + " id=" + requestId + return "NetworkRequest [ " + type + " id=" + requestId +
(legacyType != ConnectivityManager.TYPE_NONE ? ", legacyType=" + legacyType : "") + (legacyType != ConnectivityManager.TYPE_NONE ? ", legacyType=" + legacyType : "") +