Merge "Clearly log tether_offload_disabled setting status in start()" into oc-dr1-dev

am: f12ff31046 Change-Id: I99f6abc31579b4b25589452c44e1834a7ba4e591
2017-07-06 05:56:14 +00:00
parent 6730551b85 f12ff31046
commit 03172fb037
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();