Delete unnecessary createEthernetTrackerConfig function
Test: TH
Change-Id: I145de9bfc4b3c57a18a652eebfe6c668920e7851
diff --git a/service-t/src/com/android/server/ethernet/EthernetTracker.java b/service-t/src/com/android/server/ethernet/EthernetTracker.java
index 48467ed..e656eb9 100644
--- a/service-t/src/com/android/server/ethernet/EthernetTracker.java
+++ b/service-t/src/com/android/server/ethernet/EthernetTracker.java
@@ -753,7 +753,7 @@
* <interface name|mac address>;[Network Capabilities];[IP config];[Override Transport]}
*/
private void parseEthernetConfig(String configString) {
- final EthernetTrackerConfig config = createEthernetTrackerConfig(configString);
+ final EthernetTrackerConfig config = new EthernetTrackerConfig(configString);
NetworkCapabilities nc;
// Starting with Android B (API level 36), we provide default NetworkCapabilities
// for Ethernet interfaces when no explicit capabilities are specified in the
@@ -779,12 +779,6 @@
}
}
- @VisibleForTesting
- static EthernetTrackerConfig createEthernetTrackerConfig(@NonNull final String configString) {
- Objects.requireNonNull(configString, "EthernetTrackerConfig requires non-null config");
- return new EthernetTrackerConfig(configString.split(";", /* limit of tokens */ 4));
- }
-
private static NetworkCapabilities createDefaultNetworkCapabilities(
boolean isTestIface, @Nullable String overrideTransport) {
NetworkCapabilities.Builder builder =
@@ -1057,8 +1051,9 @@
final String mIpConfig;
final String mTransport;
- EthernetTrackerConfig(@NonNull final String[] tokens) {
- Objects.requireNonNull(tokens, "EthernetTrackerConfig requires non-null tokens");
+ EthernetTrackerConfig(String configString) {
+ Objects.requireNonNull(configString, "EthernetTrackerConfig requires non-null config");
+ final String[] tokens = configString.split(";", /* limit of tokens */ 4);
mIface = tokens[0];
mCapabilities = tokens.length > 1 ? tokens[1] : null;
mIpConfig = tokens.length > 2 && !TextUtils.isEmpty(tokens[2]) ? tokens[2] : null;
diff --git a/tests/unit/java/com/android/server/ethernet/EthernetTrackerTest.java b/tests/unit/java/com/android/server/ethernet/EthernetTrackerTest.java
index 533bbf8..db7b37b 100644
--- a/tests/unit/java/com/android/server/ethernet/EthernetTrackerTest.java
+++ b/tests/unit/java/com/android/server/ethernet/EthernetTrackerTest.java
@@ -44,6 +44,7 @@
import androidx.test.filters.SmallTest;
+import com.android.server.ethernet.EthernetTracker.EthernetTrackerConfig;
import com.android.testutils.DevSdkIgnoreRule;
import com.android.testutils.DevSdkIgnoreRunner;
import com.android.testutils.HandlerUtils;
@@ -298,8 +299,7 @@
final String transport = "4";
final String configString = String.join(";", TEST_IFACE, capabilities, ipConfig, transport);
- final EthernetTracker.EthernetTrackerConfig config =
- EthernetTracker.createEthernetTrackerConfig(configString);
+ final EthernetTrackerConfig config = new EthernetTrackerConfig(configString);
assertEquals(TEST_IFACE, config.mIface);
assertEquals(capabilities, config.mCapabilities);
@@ -309,8 +309,7 @@
@Test
public void testCreateEthernetTrackerConfigThrowsNpeWithNullInput() {
- assertThrows(NullPointerException.class,
- () -> EthernetTracker.createEthernetTrackerConfig(null));
+ assertThrows(NullPointerException.class, () -> new EthernetTrackerConfig(null));
}
@Test