Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: Id65464c0e2983a580c3b072b31b765dfae617d9b
This commit is contained in:
Automerger Merge Worker
2020-02-20 00:38:24 +00:00
parent ab0a3ea5f6 b1b7db8c76
commit 911b4cf5cd
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/Tethering/src/com/android/server/connectivity/tethering/Tethering.java
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();