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

Commit a8fc17da authored by Harout Hedeshian's avatar Harout Hedeshian Committed by Steve Kondik
Browse files

base: Fix for wifi tethering crash 

Pass network info along with CMD_UPSTREAM_CHANGED
Added a NULL check for Network info in CMD_UPSTREAM_CHANGED

CRs-fixed: 562910
Change-Id: I98bd37205255d9d4025cfb95b0688c68bce3c9bd
parent 1c5a97d1

services/java/com/android/server/ConnectivityService.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -2544,7 +2544,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
        if (TextUtils.equals(mNetTrackers[netType].getNetworkInfo().getReason(),

        if (TextUtils.equals(mNetTrackers[netType].getNetworkInfo().getReason(),

                             PhoneConstants.REASON_LINK_PROPERTIES_CHANGED)) {

                             PhoneConstants.REASON_LINK_PROPERTIES_CHANGED)) {

            if (isTetheringSupported()) {

            if (isTetheringSupported()) {

                mTethering.handleTetherIfaceChange();

                mTethering.handleTetherIfaceChange(mNetTrackers[netType].getNetworkInfo());

            }

            }

        }

        }

    }

    }

services/java/com/android/server/connectivity/Tethering.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -764,8 +764,8 @@ public class Tethering extends INetworkManagementEventObserver.Stub { 
    //      CONNECTIVITY_ACTION. Only to accomodate interface

    //      CONNECTIVITY_ACTION. Only to accomodate interface

    //      switch during HO.

    //      switch during HO.

    //      @see bug/4455071

    //      @see bug/4455071

    public void handleTetherIfaceChange() {

    public void handleTetherIfaceChange(NetworkInfo info) {

        mTetherMasterSM.sendMessage(TetherMasterSM.CMD_UPSTREAM_CHANGED);

        mTetherMasterSM.sendMessage(TetherMasterSM.CMD_UPSTREAM_CHANGED, info);

    }

    }





    class TetherInterfaceSM extends StateMachine {

    class TetherInterfaceSM extends StateMachine {