commit 28e7899139f9a758b073fb319a7ab09be89d01f0
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Mar 26 07:15:13 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Mar 26 07:15:13 2020 +0000
tree 5d39e188426638e4ff2c7be9d7d09cc80f41c465
parent 7f416f2841b6fc3a96b6062aac0e98e8d7fa2cbb
parent 595266e4a861fc32e9cc913660f14ec57ba6565e

Merge "Add a log message if enabling Ethernet tethering if it is already enabled." into rvc-dev am: 6f3e64a56e

Change-Id: If94b2b9a8e816e20ca6c45b2a4e4c4cdf3b2448a

Tethering/src/com/android/server/connectivity/tethering/Tethering.java

diff --git a/Tethering/src/com/android/server/connectivity/tethering/Tethering.java b/Tethering/src/com/android/server/connectivity/tethering/Tethering.java
index 77ff617..3624dc7 100644
--- a/Tethering/src/com/android/server/connectivity/tethering/Tethering.java
+++ b/Tethering/src/com/android/server/connectivity/tethering/Tethering.java
@@ -637,7 +637,10 @@
                 Context.ETHERNET_SERVICE);
         synchronized (mPublicSync) {
             if (enable) {
-                if (mEthernetCallback != null) return TETHER_ERROR_NO_ERROR;
+                if (mEthernetCallback != null) {
+                    Log.d(TAG, "Ethernet tethering already started");
+                    return TETHER_ERROR_NO_ERROR;
+                }
 
                 mEthernetCallback = new EthernetCallback();
                 mEthernetIfaceRequest = em.requestTetheredInterface(mExecutor, mEthernetCallback);