Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Making EthernetNetworkSpecifier public" am: d13094cef4 am: ac80eedcdf am: e33c5bc477

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

Change-Id: Ic38fe8ba6fadbfe787541475a204014ba8724527
This commit is contained in:
James Mattis
2022-02-10 23:12:47 +00:00
committed by Automerger Merge Worker
parent c04b192082 e33c5bc477
commit e3544f7419
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/api/current.txt
View File

@@ -25259,6 +25259,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();

8
core/api/module-lib-current.txt
View File

@@ -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);
}

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

@@ -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);