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

Commit 1bafcb69 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Make getNetworkSpecifier() public API." am: ad60ef88 am: 31f969ba am: fead85c4 

Change-Id: I73894e4236dc5660f2eb54be3d48aa7359822947
parents 7d47a496 fead85c4

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -29213,6 +29213,7 @@ package android.net { 














  public class NetworkRequest implements android.os.Parcelable {















    method public int describeContents();













    method @Nullable public android.net.NetworkSpecifier getNetworkSpecifier();















    method public boolean hasCapability(int);















    method public boolean hasTransport(int);















    method public void writeToParcel(android.os.Parcel, int);

























core/java/android/net/NetworkRequest.java



+9
−0




























Original line number
Diff line number
Diff line








@@ -17,6 +17,7 @@













package android.net;































import android.annotation.NonNull;













import android.annotation.Nullable;















import android.annotation.RequiresPermission;















import android.annotation.SystemApi;















import android.annotation.UnsupportedAppUsage;










@@ -461,6 +462,14 @@ public class NetworkRequest implements Parcelable {













        return networkCapabilities.hasTransport(transportType);















    }





























    /**













     * @see Builder#setNetworkSpecifier(NetworkSpecifier)













     */













    @Nullable













    public NetworkSpecifier getNetworkSpecifier() {













        return networkCapabilities.getNetworkSpecifier();













    }





























    public String toString() {















        return "NetworkRequest [ " + type + " id=" + requestId +















                (legacyType != ConnectivityManager.TYPE_NONE ? ", legacyType=" + legacyType : "") +