diff options
| author | 2020-02-20 00:38:24 +0000 | |
|---|---|---|
| committer | 2020-02-20 00:38:24 +0000 | |
| commit | 911b4cf5cd0c1d7fcde31697cb512e7421698a59 (patch) | |
| tree | e4f79a2d1045863e221520506b0b722a59d715ba | |
| parent | ab0a3ea5f681567bfeb69679dec9cafaac122379 (diff) | |
| parent | b1b7db8c7669513f61f77c96ff8609896b158c59 (diff) | |
Merge "Tethering: Don't crash if wifi unavailable." am: 084e8536d1 am: b1b7db8c76
Change-Id: Id65464c0e2983a580c3b072b31b765dfae617d9b
| -rw-r--r-- | packages/Tethering/src/com/android/server/connectivity/tethering/Tethering.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/packages/Tethering/src/com/android/server/connectivity/tethering/Tethering.java b/packages/Tethering/src/com/android/server/connectivity/tethering/Tethering.java index e462d36cc7a8..33335633f61d 100644 --- 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) { |