Merge "Tethering: Don't crash if wifi unavailable." am: 084e8536d1

Change-Id: If873646e8e9ef2d79abd0ef19ae623e2f5ada7ac
2020-02-20 00:22:47 +00:00
parent 329d286b88 084e8536d1
commit b1b7db8c76
1 changed files with 7 additions and 3 deletions
--- a/packages/Tethering/src/com/android/server/connectivity/tethering/Tethering.java
+++ b/packages/Tethering/src/com/android/server/connectivity/tethering/Tethering.java
@@ -314,9 +314,13 @@ public class Tethering {

        startStateMachineUpdaters(mHandler);
        startTrackDefaultNetwork();
-        getWifiManager().registerSoftApCallback(
-                mHandler::post /* executor */,
-                new TetheringSoftApCallback());
+
+        final WifiManager wifiManager = getWifiManager();
+        if (wifiManager != null) {
+            wifiManager.registerSoftApCallback(
+                  mHandler::post /* executor */,
+                  new TetheringSoftApCallback());
+        }
    }

    private void startStateMachineUpdaters(Handler handler) {