| commit | 526ccd7a1d2e303a5cdb1f0a3201b33ce0184123 | [log] [tgz] |
|---|---|---|
| author | Xiao Ma <xiaom@google.com> | Thu Mar 17 16:27:45 2022 +0000 |
| committer | Xiao Ma <xiaom@google.com> | Tue Mar 22 03:37:56 2022 +0000 |
| tree | ccd2dd7cbf7e1c36a55c68caa0f04f13b901c833 | |
| parent | 059a174baf5b73f33e55eec03662dc6b2c73b4f3 [diff] |
Add shim for EthernetManager#getInterfaceList. Bug: 171872016 Test: m Merged-In: If924556340b197d791b3fc9d727e112169be53f2 Change-Id: I16d734c9d8493cf22c8d7edf4f9b8aa58ca2c511
diff --git a/apishim/33/com/android/networkstack/apishim/EthernetManagerShimImpl.java b/apishim/33/com/android/networkstack/apishim/EthernetManagerShimImpl.java index 92df86d..82a8f35 100644 --- a/apishim/33/com/android/networkstack/apishim/EthernetManagerShimImpl.java +++ b/apishim/33/com/android/networkstack/apishim/EthernetManagerShimImpl.java
@@ -27,6 +27,7 @@ import com.android.networkstack.apishim.common.EthernetManagerShim; +import java.util.List; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.Executor; @@ -95,4 +96,10 @@ public void setIncludeTestInterfaces(boolean include) { mEm.setIncludeTestInterfaces(include); } + + @Override + @NonNull + public List<String> getInterfaceList() { + return mEm.getInterfaceList(); + } }
diff --git a/apishim/common/com/android/networkstack/apishim/common/EthernetManagerShim.java b/apishim/common/com/android/networkstack/apishim/common/EthernetManagerShim.java index 85cf1cc..02a08de 100644 --- a/apishim/common/com/android/networkstack/apishim/common/EthernetManagerShim.java +++ b/apishim/common/com/android/networkstack/apishim/common/EthernetManagerShim.java
@@ -21,7 +21,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; - +import java.util.List; import java.util.concurrent.Executor; /** API shim for EthernetManager */ @@ -55,4 +55,9 @@ default void setIncludeTestInterfaces(boolean include) throws UnsupportedApiLevelException { throw new UnsupportedApiLevelException("Not supported until API 30"); } + + /** Shim for EthernetManager#getInterfaceList */ + default List<String> getInterfaceList() throws UnsupportedApiLevelException { + throw new UnsupportedApiLevelException("Not supported until API 33"); + } }