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

Commit fead85c4 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

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

Change-Id: I884c4e4c9ed891594845d599358f19f4a8e2ad60
parents 09fa28fc 31f969ba

api/current.txt

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
















  public class NetworkRequest implements android.os.Parcelable {







  public class NetworkRequest implements android.os.Parcelable {











    method public int describeContents();







    method public int describeContents();














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











    method public boolean hasCapability(int);







    method public boolean hasCapability(int);











    method public boolean hasTransport(int);







    method public boolean hasTransport(int);











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







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

























core/java/android/net/NetworkRequest.java



+9
−0




























Original line number
Original line
Diff line number
Diff line








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









package android.net;







package android.net;































import android.annotation.NonNull;







import android.annotation.NonNull;














import android.annotation.Nullable;











import android.annotation.RequiresPermission;







import android.annotation.RequiresPermission;











import android.annotation.SystemApi;







import android.annotation.SystemApi;











import android.annotation.UnsupportedAppUsage;







import android.annotation.UnsupportedAppUsage;










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









        return networkCapabilities.hasTransport(transportType);







        return networkCapabilities.hasTransport(transportType);











    }







    }


































    /**














     * @see Builder#setNetworkSpecifier(NetworkSpecifier)














     */














    @Nullable














    public NetworkSpecifier getNetworkSpecifier() {














        return networkCapabilities.getNetworkSpecifier();














    }


























    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 : "") +