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

Commit e79e09fe authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "base: Fix for wifi tethering crash"

parents 52930563 c3e56298

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -2548,7 +2548,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

+4 −4
Original line number Original line Diff line number Diff line
@@ -517,7 +517,7 @@ public class Tethering extends INetworkManagementEventObserver.Stub { 
                if (networkInfo != null &&

                if (networkInfo != null &&

                        networkInfo.getDetailedState() != NetworkInfo.DetailedState.FAILED) {

                        networkInfo.getDetailedState() != NetworkInfo.DetailedState.FAILED) {

                    if (VDBG) Log.d(TAG, "Tethering got CONNECTIVITY_ACTION");

                    if (VDBG) Log.d(TAG, "Tethering got CONNECTIVITY_ACTION");

                    mTetherMasterSM.sendMessage(TetherMasterSM.CMD_UPSTREAM_CHANGED);

                    mTetherMasterSM.sendMessage(TetherMasterSM.CMD_UPSTREAM_CHANGED, networkInfo);

                }

                }

            } else if (action.equals(Intent.ACTION_CONFIGURATION_CHANGED)) {

            } else if (action.equals(Intent.ACTION_CONFIGURATION_CHANGED)) {

                updateConfiguration();

                updateConfiguration();
@@ -735,8 +735,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 {
@@ -1552,7 +1552,7 @@ public class Tethering extends INetworkManagementEventObserver.Stub { 
                        NetworkInfo info = (NetworkInfo) message.obj;

                        NetworkInfo info = (NetworkInfo) message.obj;

                        mTryCell = !WAIT_FOR_NETWORK_TO_SETTLE;

                        mTryCell = !WAIT_FOR_NETWORK_TO_SETTLE;

                        chooseUpstreamType(mTryCell);

                        chooseUpstreamType(mTryCell);

                        if (!info.isConnected()) {

                        if ((info != null) && (!info.isConnected())) {

                            IBinder b = ServiceManager.getService(Context.CONNECTIVITY_SERVICE);

                            IBinder b = ServiceManager.getService(Context.CONNECTIVITY_SERVICE);

                            IConnectivityManager cm = IConnectivityManager.Stub.asInterface(b);

                            IConnectivityManager cm = IConnectivityManager.Stub.asInterface(b);

                            try {

                            try {