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

Commit e33c5bc4 authored by James Mattis's avatar James Mattis Committed by Automerger Merge Worker
Browse files

Merge "Making EthernetNetworkSpecifier public" am: d13094ce am: ac80eedc 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1971181

Change-Id: I24f579d2d446272a1cf60dcb5f509e051b9aeb15
parents 7110d66b ac80eedc

core/api/current.txt

+8 −0
Original line number Diff line number Diff line
@@ -25199,6 +25199,14 @@ package android.net { 
    method public int getUid();

  }













  public final class EthernetNetworkSpecifier extends android.net.NetworkSpecifier implements android.os.Parcelable {













    ctor public EthernetNetworkSpecifier(@NonNull String);













    method public int describeContents();













    method @Nullable public String getInterfaceName();













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













    field @NonNull public static final android.os.Parcelable.Creator<android.net.EthernetNetworkSpecifier> CREATOR;













  }



























  public final class Ikev2VpnProfile extends android.net.PlatformVpnProfile {















    method @NonNull public java.util.List<java.lang.String> getAllowedAlgorithms();















    method public int getMaxMtu();

























core/api/module-lib-current.txt



+0
−8




























Original line number
Diff line number
Diff line








@@ -218,14 +218,6 @@ package android.media.session {





























package android.net {





























  public final class EthernetNetworkSpecifier extends android.net.NetworkSpecifier implements android.os.Parcelable {













    ctor public EthernetNetworkSpecifier(@NonNull String);













    method public int describeContents();













    method @Nullable public String getInterfaceName();













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













    field @NonNull public static final android.os.Parcelable.Creator<android.net.EthernetNetworkSpecifier> CREATOR;













  }





























  public class LocalSocket implements java.io.Closeable {















    ctor public LocalSocket(@NonNull java.io.FileDescriptor);















  }

































packages/ConnectivityT/framework-t/src/android/net/EthernetNetworkSpecifier.java



+1
−3




























Original line number
Diff line number
Diff line








@@ -18,7 +18,6 @@ package android.net;





























import android.annotation.NonNull;















import android.annotation.Nullable;













import android.annotation.SystemApi;















import android.os.Parcel;















import android.os.Parcelable;















import android.text.TextUtils;









@@ -29,9 +28,7 @@ import java.util.Objects;













 * A {@link NetworkSpecifier} used to identify ethernet interfaces.















 *















 * @see EthernetManager













 * @hide















 */













@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)















public final class EthernetNetworkSpecifier extends NetworkSpecifier implements Parcelable {































    /**










@@ -61,6 +58,7 @@ public final class EthernetNetworkSpecifier extends NetworkSpecifier implements













        return mInterfaceName;















    }





























    /** @hide */















    @Override















    public boolean canBeSatisfiedBy(@Nullable NetworkSpecifier other) {















        return equals(other);