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

Commit 1ccb10e2 authored by Kazuhiro Ondo's avatar Kazuhiro Ondo Committed by Wink Saville
Browse files

Temporary re-enabling iface name change handling on HO 

Temporary accept interface name change in ConnectivityService.
See bug/4455071.

Bug: 4903011
Change-Id: I7f06c2ca83535b981f047cb671e08550aed7df1a
parent 1d6ffd73

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

+14 −1
Original line number Diff line number Diff line
@@ -1440,6 +1440,16 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
                }

            }

        }



        // TODO: Temporary notifying upstread change to Tethering.

        //       @see bug/4455071

        /** Notify TetheringService if interface name has been changed. */

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

                             Phone.REASON_LINK_PROPERTIES_CHANGED)) {

            if (isTetheringSupported()) {

                mTethering.handleTetherIfaceChange();

            }

        }

    }



    private void addPrivateDnsRoutes(NetworkStateTracker nt) {
@@ -1882,7 +1892,10 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
                    break;

                case NetworkStateTracker.EVENT_CONFIGURATION_CHANGED:

                    info = (NetworkInfo) msg.obj;

                    handleConnectivityChange(info.getType(), true);

                    // TODO: Temporary allowing network configuration

                    //       change not resetting sockets.

                    //       @see bug/4455071

                    handleConnectivityChange(info.getType(), false);

                    break;

                case EVENT_CLEAR_NET_TRANSITION_WAKELOCK:

                    String causedBy = null;

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

+8 −0
Original line number Diff line number Diff line
@@ -709,6 +709,14 @@ public class Tethering extends INetworkManagementEventObserver.Stub { 
        return retVal;

    }



    //TODO: Temporary handling upstream change triggered without

    //      CONNECTIVITY_ACTION. Only to accomodate interface

    //      switch during HO.

    //      @see bug/4455071

    public void handleTetherIfaceChange() {

        mTetherMasterSM.sendMessage(TetherMasterSM.CMD_UPSTREAM_CHANGED);

    }



    class TetherInterfaceSM extends StateMachine {

        // notification from the master SM that it's not in tether mode

        static final int CMD_TETHER_MODE_DEAD            =  1;