From 4c958ed596184b7ac0eab5dbb2ab4f339670bad8 Mon Sep 17 00:00:00 2001
From: James Mattis <jmattis@google.com>
Date: Thu, 3 Feb 2022 19:09:36 -0800
Subject: [PATCH] Making EthernetNetworkSpecifier public

Bug: 210485380
Test: atest EthernetServiceTests
atest CtsNetTestCasesLatestSdk

cherry pick of aosp/1971181

Change-Id: Ic0b7a3360745632eb024a97692e49f6c8dafa3ee
---
 core/api/current.txt                                      | 8 ++++++++
 core/api/module-lib-current.txt                           | 8 --------
 .../src/android/net/EthernetNetworkSpecifier.java         | 4 +---
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/core/api/current.txt b/core/api/current.txt
index b4561b1f0fc14..59ae678789473 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -26395,6 +26395,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();
diff --git a/core/api/module-lib-current.txt b/core/api/module-lib-current.txt
index 36d54f59ed3f0..5df593d59f830 100644
--- a/core/api/module-lib-current.txt
+++ b/core/api/module-lib-current.txt
@@ -250,14 +250,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);
   }
diff --git a/packages/ConnectivityT/framework-t/src/android/net/EthernetNetworkSpecifier.java b/packages/ConnectivityT/framework-t/src/android/net/EthernetNetworkSpecifier.java
index 925d12b574a64..e4d6e248d48a3 100644
--- a/packages/ConnectivityT/framework-t/src/android/net/EthernetNetworkSpecifier.java
+++ b/packages/ConnectivityT/framework-t/src/android/net/EthernetNetworkSpecifier.java
@@ -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);