Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1b7db8c authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

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

Change-Id: If873646e8e9ef2d79abd0ef19ae623e2f5ada7ac
parents 329d286b 084e8536

packages/Tethering/src/com/android/server/connectivity/tethering/Tethering.java

+7 −3
Original line number Diff line number Diff line
@@ -314,10 +314,14 @@ public class Tethering { 


        startStateMachineUpdaters(mHandler);

        startTrackDefaultNetwork();

        getWifiManager().registerSoftApCallback(



        final WifiManager wifiManager = getWifiManager();

        if (wifiManager != null) {

            wifiManager.registerSoftApCallback(

                  mHandler::post /* executor */,

                  new TetheringSoftApCallback());

        }

    }



    private void startStateMachineUpdaters(Handler handler) {

        mCarrierConfigChange.startListening();