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

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

Merge "tethering: update connectivity intent"

parents dcdf0c5e 2887b0b1

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

+3 −3
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ public class Tethering extends BaseNetworkObserver { 
        mStateReceiver = new StateReceiver();

        IntentFilter filter = new IntentFilter();

        filter.addAction(UsbManager.ACTION_USB_STATE);

        filter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);

        filter.addAction(ConnectivityManager.CONNECTIVITY_ACTION_IMMEDIATE);

        filter.addAction(Intent.ACTION_CONFIGURATION_CHANGED);

        filter.addAction(WIFI_AP_STATE_CHANGED_ACTION);
@@ -768,12 +768,12 @@ public class Tethering extends BaseNetworkObserver { 
                    }

                    mUsbTetherRequested = false;

                }

            } else if (action.equals(ConnectivityManager.CONNECTIVITY_ACTION)) {

            } else if (action.equals(ConnectivityManager.CONNECTIVITY_ACTION_IMMEDIATE)) {

                NetworkInfo networkInfo = (NetworkInfo)intent.getParcelableExtra(

                        ConnectivityManager.EXTRA_NETWORK_INFO);

                if (networkInfo != null &&

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

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

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

                    mTetherMasterSM.sendMessage(TetherMasterSM.CMD_UPSTREAM_CHANGED, networkInfo);

                }

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