commit 595266e4a861fc32e9cc913660f14ec57ba6565e
author Treehugger Robot <treehugger-gerrit@google.com> Tue Mar 24 15:23:51 2020 +0000
committer Lorenzo Colitti <lorenzo@google.com> Thu Mar 26 05:05:35 2020 +0000
tree 5d39e188426638e4ff2c7be9d7d09cc80f41c465
parent 3d9c05e402b50a3ee623cb5dfff8ec7c25094179

Add a log message if enabling Ethernet tethering if it is already enabled.

Test: builds
Bug: 150644681
Change-Id: I68123e6dd04ccae5da2ecd7526c11d9f835d1d57
Merged-In: I68123e6dd04ccae5da2ecd7526c11d9f835d1d57
(cherry picked from commit e6b8ded8121c137a7e434e1c2a9e04cc144f2f28)

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);