diff --git a/service-t/src/com/android/server/ethernet/EthernetServiceImpl.java b/service-t/src/com/android/server/ethernet/EthernetServiceImpl.java index edf04b2570..f6a55c89dd 100644 --- a/service-t/src/com/android/server/ethernet/EthernetServiceImpl.java +++ b/service-t/src/com/android/server/ethernet/EthernetServiceImpl.java @@ -289,7 +289,7 @@ public class EthernetServiceImpl extends IEthernetManager.Stub { enforceAdminPermission(iface, false, "enableInterface()"); - mTracker.enableInterface(iface, new EthernetCallback(cb)); + mTracker.setInterfaceEnabled(iface, true /* enabled */, new EthernetCallback(cb)); } @Override @@ -301,7 +301,7 @@ public class EthernetServiceImpl extends IEthernetManager.Stub { enforceAdminPermission(iface, false, "disableInterface()"); - mTracker.disableInterface(iface, new EthernetCallback(cb)); + mTracker.setInterfaceEnabled(iface, false /* enabled */, new EthernetCallback(cb)); } @Override diff --git a/service-t/src/com/android/server/ethernet/EthernetTracker.java b/service-t/src/com/android/server/ethernet/EthernetTracker.java index 95baf81774..852cf42a5c 100644 --- a/service-t/src/com/android/server/ethernet/EthernetTracker.java +++ b/service-t/src/com/android/server/ethernet/EthernetTracker.java @@ -371,15 +371,9 @@ public class EthernetTracker { } @VisibleForTesting(visibility = PACKAGE) - protected void enableInterface(@NonNull final String iface, + protected void setInterfaceEnabled(@NonNull final String iface, boolean enabled, @Nullable final EthernetCallback cb) { - mHandler.post(() -> updateInterfaceState(iface, true, cb)); - } - - @VisibleForTesting(visibility = PACKAGE) - protected void disableInterface(@NonNull final String iface, - @Nullable final EthernetCallback cb) { - mHandler.post(() -> updateInterfaceState(iface, false, cb)); + mHandler.post(() -> updateInterfaceState(iface, enabled, cb)); } IpConfiguration getIpConfiguration(String iface) { diff --git a/tests/unit/java/com/android/server/ethernet/EthernetServiceImplTest.java b/tests/unit/java/com/android/server/ethernet/EthernetServiceImplTest.java index 9bf893a58b..de0af94142 100644 --- a/tests/unit/java/com/android/server/ethernet/EthernetServiceImplTest.java +++ b/tests/unit/java/com/android/server/ethernet/EthernetServiceImplTest.java @@ -312,14 +312,15 @@ public class EthernetServiceImplTest { @Test public void testEnableInterface() { mEthernetServiceImpl.enableInterface(TEST_IFACE, NULL_LISTENER); - verify(mEthernetTracker).enableInterface(eq(TEST_IFACE), + verify(mEthernetTracker).setInterfaceEnabled(eq(TEST_IFACE), eq(true), any(EthernetCallback.class)); } @Test public void testDisableInterface() { 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 @@ -384,7 +385,7 @@ public class EthernetServiceImplTest { denyManageEthPermission(); mEthernetServiceImpl.enableInterface(TEST_IFACE, NULL_LISTENER); - verify(mEthernetTracker).enableInterface(eq(TEST_IFACE), + verify(mEthernetTracker).setInterfaceEnabled(eq(TEST_IFACE), eq(true), any(EthernetCallback.class)); } @@ -395,7 +396,7 @@ public class EthernetServiceImplTest { denyManageEthPermission(); mEthernetServiceImpl.disableInterface(TEST_IFACE, NULL_LISTENER); - verify(mEthernetTracker).disableInterface(eq(TEST_IFACE), + verify(mEthernetTracker).setInterfaceEnabled(eq(TEST_IFACE), eq(false), any(EthernetCallback.class)); }