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

This commit is contained in:
Treehugger Robot
2020-02-19 23:52:36 +00:00
committed by Gerrit Code Review

View File

@@ -314,10 +314,14 @@ public class Tethering {
startStateMachineUpdaters(mHandler); startStateMachineUpdaters(mHandler);
startTrackDefaultNetwork(); startTrackDefaultNetwork();
getWifiManager().registerSoftApCallback(
final WifiManager wifiManager = getWifiManager();
if (wifiManager != null) {
wifiManager.registerSoftApCallback(
mHandler::post /* executor */, mHandler::post /* executor */,
new TetheringSoftApCallback()); new TetheringSoftApCallback());
} }
}
private void startStateMachineUpdaters(Handler handler) { private void startStateMachineUpdaters(Handler handler) {
mCarrierConfigChange.startListening(); mCarrierConfigChange.startListening();