commit 232904e22b599f898ade796bea98aabb69a96d4f
author Treehugger Robot <treehugger-gerrit@google.com> Tue Mar 24 15:13:07 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Mar 24 15:13:07 2020 +0000
tree 16485315bd54ee4cc3cb4019db4d7d4727e00d8d
parent aef3194eca4b8a4ef15c648661ba3312d6e8f30e
parent 93a404041dd03fd355f24e36cd02e11493219a4d

Merge "Add a log message if enabling Ethernet tethering if it is already enabled." am: 93a404041d

Change-Id: I615b8ebc69de6d35a8dcc4e64f578c3687d279cc

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 3dcc15f..167e044 100644
--- a/Tethering/src/com/android/server/connectivity/tethering/Tethering.java
+++ b/Tethering/src/com/android/server/connectivity/tethering/Tethering.java
@@ -635,7 +635,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);