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

Change-Id: Id65464c0e2983a580c3b072b31b765dfae617d9b
2020-02-20 00:38:24 +00:00
parent ab0a3ea5f6 b1b7db8c76
commit 911b4cf5cd
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) {