Remove hidden ArrayUtils usage in TetheringTest am: 3dfafbb516
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1779756 Change-Id: Ibf6c0bc564482191e5932a71c1f36248c8053593
This commit is contained in:
@@ -178,10 +178,10 @@ import androidx.annotation.NonNull;
|
||||
import androidx.test.filters.SmallTest;
|
||||
import androidx.test.runner.AndroidJUnit4;
|
||||
|
||||
import com.android.internal.util.ArrayUtils;
|
||||
import com.android.internal.util.StateMachine;
|
||||
import com.android.internal.util.test.BroadcastInterceptingContext;
|
||||
import com.android.internal.util.test.FakeSettingsProvider;
|
||||
import com.android.net.module.util.CollectionUtils;
|
||||
import com.android.networkstack.tethering.TestConnectivityManager.TestNetworkAgent;
|
||||
import com.android.testutils.MiscAsserts;
|
||||
|
||||
@@ -365,7 +365,8 @@ public class TetheringTest {
|
||||
final String[] ifaces = new String[] {
|
||||
TEST_RNDIS_IFNAME, TEST_WLAN_IFNAME, TEST_WIFI_IFNAME, TEST_MOBILE_IFNAME,
|
||||
TEST_DUN_IFNAME, TEST_P2P_IFNAME, TEST_NCM_IFNAME, TEST_ETH_IFNAME};
|
||||
return new InterfaceParams(ifName, ArrayUtils.indexOf(ifaces, ifName) + IFINDEX_OFFSET,
|
||||
return new InterfaceParams(ifName,
|
||||
CollectionUtils.indexOf(ifaces, ifName) + IFINDEX_OFFSET,
|
||||
MacAddress.ALL_ZEROS_ADDRESS);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user