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

Merge "ethernet: consolidate interface enabling functions in EthernetTracker"

Browse Source
This commit is contained in:
Treehugger Robot
2022-11-16 05:51:42 +00:00
committed by Gerrit Code Review
parent 84a28a97b6 6150134515
commit b6f2a3e587
3 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
service-t/src/com/android/server/ethernet/EthernetServiceImpl.java
View File

@@ -289,7 +289,7 @@ public class EthernetServiceImpl extends IEthernetManager.Stub {
enforceAdminPermission(iface, false, "enableInterface()"); enforceAdminPermission(iface, false, "enableInterface()");
mTracker.enableInterface(iface, new EthernetCallback(cb)); mTracker.setInterfaceEnabled(iface, true /* enabled */, new EthernetCallback(cb));
} }
@Override @Override
@@ -301,7 +301,7 @@ public class EthernetServiceImpl extends IEthernetManager.Stub {
enforceAdminPermission(iface, false, "disableInterface()"); enforceAdminPermission(iface, false, "disableInterface()");
mTracker.disableInterface(iface, new EthernetCallback(cb)); mTracker.setInterfaceEnabled(iface, false /* enabled */, new EthernetCallback(cb));
} }
@Override @Override

10
service-t/src/com/android/server/ethernet/EthernetTracker.java
View File

@@ -371,15 +371,9 @@ public class EthernetTracker {
} }
@VisibleForTesting(visibility = PACKAGE) @VisibleForTesting(visibility = PACKAGE)
protected void enableInterface(@NonNull final String iface, protected void setInterfaceEnabled(@NonNull final String iface, boolean enabled,
@Nullable final EthernetCallback cb) { @Nullable final EthernetCallback cb) {
mHandler.post(() -> updateInterfaceState(iface, true, cb)); mHandler.post(() -> updateInterfaceState(iface, enabled, cb));
}
@VisibleForTesting(visibility = PACKAGE)
protected void disableInterface(@NonNull final String iface,
@Nullable final EthernetCallback cb) {
mHandler.post(() -> updateInterfaceState(iface, false, cb));
} }
IpConfiguration getIpConfiguration(String iface) { IpConfiguration getIpConfiguration(String iface) {

9
tests/unit/java/com/android/server/ethernet/EthernetServiceImplTest.java
View File

@@ -312,14 +312,15 @@ public class EthernetServiceImplTest {
@Test @Test
public void testEnableInterface() { public void testEnableInterface() {
mEthernetServiceImpl.enableInterface(TEST_IFACE, NULL_LISTENER); mEthernetServiceImpl.enableInterface(TEST_IFACE, NULL_LISTENER);
verify(mEthernetTracker).enableInterface(eq(TEST_IFACE), verify(mEthernetTracker).setInterfaceEnabled(eq(TEST_IFACE), eq(true),
any(EthernetCallback.class)); any(EthernetCallback.class));
} }
@Test @Test
public void testDisableInterface() { public void testDisableInterface() {
mEthernetServiceImpl.disableInterface(TEST_IFACE, NULL_LISTENER); mEthernetServiceImpl.disableInterface(TEST_IFACE, NULL_LISTENER);
verify(mEthernetTracker).disableInterface(eq(TEST_IFACE), any(EthernetCallback.class)); verify(mEthernetTracker).setInterfaceEnabled(eq(TEST_IFACE), eq(false),
any(EthernetCallback.class));
} }
@Test @Test
@@ -384,7 +385,7 @@ public class EthernetServiceImplTest {
denyManageEthPermission(); denyManageEthPermission();
mEthernetServiceImpl.enableInterface(TEST_IFACE, NULL_LISTENER); mEthernetServiceImpl.enableInterface(TEST_IFACE, NULL_LISTENER);
verify(mEthernetTracker).enableInterface(eq(TEST_IFACE), verify(mEthernetTracker).setInterfaceEnabled(eq(TEST_IFACE), eq(true),
any(EthernetCallback.class)); any(EthernetCallback.class));
} }
@@ -395,7 +396,7 @@ public class EthernetServiceImplTest {
denyManageEthPermission(); denyManageEthPermission();
mEthernetServiceImpl.disableInterface(TEST_IFACE, NULL_LISTENER); mEthernetServiceImpl.disableInterface(TEST_IFACE, NULL_LISTENER);
verify(mEthernetTracker).disableInterface(eq(TEST_IFACE), verify(mEthernetTracker).setInterfaceEnabled(eq(TEST_IFACE), eq(false),
any(EthernetCallback.class)); any(EthernetCallback.class));
} }