Merge "Clearly log tether_offload_disabled setting status in start()"

am: b171a46d19 Change-Id: I999926bf0b67b12caadeea2d3766d8f69913bafe
2017-07-06 08:02:44 +00:00
parent e62a5fc7d3 b171a46d19
commit aa9d12fa56
1 changed files with 6 additions and 1 deletions
--- a/services/core/java/com/android/server/connectivity/tethering/OffloadController.java
+++ b/services/core/java/com/android/server/connectivity/tethering/OffloadController.java
@@ -58,7 +58,12 @@ public class OffloadController {
    }

    public void start() {
-        if (isOffloadDisabled() || started()) return;
+        if (started()) return;
+
+        if (isOffloadDisabled()) {
+            mLog.i("tethering offload disabled");
+            return;
+        }

        if (!mConfigInitialized) {
            mConfigInitialized = mHwInterface.initOffloadConfig();