summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Milim Lee <mlww.lee@samsung.com> 2020-05-26 03:11:29 +0900
committer Milim Lee <mlww.lee@samsung.com> 2020-06-19 12:44:22 +0900
commit63a6065cd233b83c576d449de78db918593fb2ea (patch)
treec57644c6b5296c642120a4e9a7ead5795db2ec49
parent7fc7043e5e16ed26ed8a979cdc655f48eed29081 (diff)
Let only Ethernet manage ethernet interface up and down
When LAN link is changed for using ethernet interface from Ethernet tethering to Ethernet, there is confiict as Ethernet Tethering is trying to make ethernet link down and Ethernet is trying to make ethernet link up. So, this would make Ethernet only manage ethernet interface link state. Test: manual Bug: 130840861 Change-Id: I1cd40ae764bdeecbb59e3889e9399b7f4b05f9cc
-rw-r--r--packages/Tethering/src/android/net/ip/IpServer.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/packages/Tethering/src/android/net/ip/IpServer.java b/packages/Tethering/src/android/net/ip/IpServer.java
index 1671dda4bd57..4cc35b42d93a 100644
--- a/packages/Tethering/src/android/net/ip/IpServer.java
+++ b/packages/Tethering/src/android/net/ip/IpServer.java
@@ -615,8 +615,9 @@ public class IpServer extends StateMachine {
final Boolean setIfaceUp;
if (mInterfaceType == TetheringManager.TETHERING_WIFI
- || mInterfaceType == TetheringManager.TETHERING_WIFI_P2P) {
- // The WiFi stack has ownership of the interface up/down state.
+ || mInterfaceType == TetheringManager.TETHERING_WIFI_P2P
+ || mInterfaceType == TetheringManager.TETHERING_ETHERNET) {
+ // The WiFi and Ethernet stack has ownership of the interface up/down state.
// It is unclear whether the Bluetooth or USB stacks will manage their own
// state.
setIfaceUp = null;