commit | 3338be6f48a70d07cd61f6e6ee8e4b5f574b72e9 | [log] [tgz] |
---|---|---|
author | James Mattis <jmattis@google.com> | Thu Feb 10 22:38:36 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Feb 10 22:38:36 2022 +0000 |
tree | 17a37151fc4662e19c1ed6caa88e013e33eb1deb | |
parent | aadb46c41f33126ef983a3edd314a7411cd4cccc [diff] | |
parent | ca0be94009194dbcae8023d7ac738501aedd5037 [diff] |
Merge "Making EthernetNetworkSpecifier public" am: d13094cef4 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1971181 Change-Id: Ifce3d11a0e0e997924bd431c9208bf8c6a95cba8
diff --git a/framework-t/src/android/net/EthernetNetworkSpecifier.java b/framework-t/src/android/net/EthernetNetworkSpecifier.java index 925d12b..e4d6e24 100644 --- a/framework-t/src/android/net/EthernetNetworkSpecifier.java +++ b/framework-t/src/android/net/EthernetNetworkSpecifier.java
@@ -18,7 +18,6 @@ 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 @@ * 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 @@ return mInterfaceName; } + /** @hide */ @Override public boolean canBeSatisfiedBy(@Nullable NetworkSpecifier other) { return equals(other);