commit 46e3a9caf6114e8c6423197e58068c55527e58af
author Treehugger Robot <treehugger-gerrit@google.com> Tue Mar 24 15:23:51 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Mar 24 15:23:51 2020 +0000
tree 7491a9e350d83226e61e82455835dfffdfa7cbd2
parent d1a0afc41f27dacc998709f49d2777faceb538f3
parent 232904e22b599f898ade796bea98aabb69a96d4f

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

Change-Id: Ibe0d3567185b4dfbfd73d085080ca90594120c1f

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 36113ac..16dd6b8 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);