LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename *Iface* APIs to *Interface*

Browse Source 
Address API review feedback, other APIs have been refering to
these as "interface" instead of "iface" so migrate the APIs named
*Iface* to *Interface*.

(cherry-picked from ag/14326779)
Bug: 183972554
Test: atest android.net.UnderlyingNetworkInfoTest
Merged-In: I38b476e762fb57fa88c4a789092d0af6f5330d80
Change-Id: I38b476e762fb57fa88c4a789092d0af6f5330d80
This commit is contained in:
Aaron Huang
2021-04-28 17:21:21 +08:00
parent b566375c5d
commit 3c4e669929
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/common/java/android/net/UnderlyingNetworkInfoTest.kt
View File

@@ -36,15 +36,15 @@ class UnderlyingNetworkInfoTest {
@Test @Test
fun testParcelUnparcel() { fun testParcelUnparcel() {
val testInfo = UnderlyingNetworkInfo(TEST_OWNER_UID, TEST_IFACE, TEST_IFACE_LIST) val testInfo = UnderlyingNetworkInfo(TEST_OWNER_UID, TEST_IFACE, TEST_IFACE_LIST)
assertEquals(TEST_OWNER_UID, testInfo.ownerUid) assertEquals(TEST_OWNER_UID, testInfo.getOwnerUid())
assertEquals(TEST_IFACE, testInfo.iface) assertEquals(TEST_IFACE, testInfo.getInterface())
assertEquals(TEST_IFACE_LIST, testInfo.underlyingIfaces) assertEquals(TEST_IFACE_LIST, testInfo.getUnderlyingInterfaces())
assertParcelSane(testInfo, 3) assertParcelSane(testInfo, 3)
val emptyInfo = UnderlyingNetworkInfo(0, String(), listOf()) val emptyInfo = UnderlyingNetworkInfo(0, String(), listOf())
assertEquals(0, emptyInfo.ownerUid) assertEquals(0, emptyInfo.getOwnerUid())
assertEquals(String(), emptyInfo.iface) assertEquals(String(), emptyInfo.getInterface())
assertEquals(listOf(), emptyInfo.underlyingIfaces) assertEquals(listOf(), emptyInfo.getUnderlyingInterfaces())
assertParcelSane(emptyInfo, 3) assertParcelSane(emptyInfo, 3)
} }
} }

12
tests/unit/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -5835,9 +5835,9 @@ public class ConnectivityServiceTest {
assertEquals("Should have exactly one VPN:", 1, infos.length); assertEquals("Should have exactly one VPN:", 1, infos.length);
UnderlyingNetworkInfo info = infos[0]; UnderlyingNetworkInfo info = infos[0];
assertEquals("Unexpected VPN owner:", (int) vpnUid, info.getOwnerUid()); assertEquals("Unexpected VPN owner:", (int) vpnUid, info.getOwnerUid());
assertEquals("Unexpected VPN interface:", vpnIfname, info.getIface()); assertEquals("Unexpected VPN interface:", vpnIfname, info.getInterface());
assertSameElementsNoDuplicates(underlyingIfaces, assertSameElementsNoDuplicates(underlyingIfaces,
info.getUnderlyingIfaces().toArray(new String[0])); info.getUnderlyingInterfaces().toArray(new String[0]));
} else { } else {
assertEquals(0, infos.length); assertEquals(0, infos.length);
return; return;
@@ -5981,8 +5981,8 @@ public class ConnectivityServiceTest {
// network for the VPN... // network for the VPN...
verify(mStatsManager, never()).notifyNetworkStatus(any(List.class), verify(mStatsManager, never()).notifyNetworkStatus(any(List.class),
any(List.class), any() /* anyString() doesn't match null */, any(List.class), any() /* anyString() doesn't match null */,
argThat(infos -> infos.get(0).getUnderlyingIfaces().size() == 1 argThat(infos -> infos.get(0).getUnderlyingInterfaces().size() == 1
&& WIFI_IFNAME.equals(infos.get(0).getUnderlyingIfaces().get(0)))); && WIFI_IFNAME.equals(infos.get(0).getUnderlyingInterfaces().get(0))));
verifyNoMoreInteractions(mStatsManager); verifyNoMoreInteractions(mStatsManager);
reset(mStatsManager); reset(mStatsManager);
@@ -5995,8 +5995,8 @@ public class ConnectivityServiceTest {
waitForIdle(); waitForIdle();
verify(mStatsManager).notifyNetworkStatus(any(List.class), verify(mStatsManager).notifyNetworkStatus(any(List.class),
any(List.class), any() /* anyString() doesn't match null */, any(List.class), any() /* anyString() doesn't match null */,
argThat(vpnInfos -> vpnInfos.get(0).getUnderlyingIfaces().size() == 1 argThat(vpnInfos -> vpnInfos.get(0).getUnderlyingInterfaces().size() == 1
&& WIFI_IFNAME.equals(vpnInfos.get(0).getUnderlyingIfaces().get(0)))); && WIFI_IFNAME.equals(vpnInfos.get(0).getUnderlyingInterfaces().get(0))));
mEthernetNetworkAgent.disconnect(); mEthernetNetworkAgent.disconnect();
waitForIdle(); waitForIdle();
reset(mStatsManager); reset(mStatsManager);