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

Commit ccd11fdf authored by David Su's avatar David Su Committed by Automerger Merge Worker
Browse files

Merge "Stop expecting WifiConfig extra from CONFIGURED_NETWORKS_CHANGED_ACTION... 

Merge "Stop expecting WifiConfig extra from CONFIGURED_NETWORKS_CHANGED_ACTION broadcast" into rvc-dev am: 15d4970c

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11923937

Change-Id: I64b302329b653390429197db7753f0e015d41d0e
parents 71c8d94f 15d4970c

src/com/android/settings/wifi/details/WifiDetailPreferenceController.java

+12 −9
Original line number Diff line number Diff line
@@ -214,15 +214,7 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController 
        public void onReceive(Context context, Intent intent) {

            switch (intent.getAction()) {

                case WifiManager.CONFIGURED_NETWORKS_CHANGED_ACTION:

                    if (!intent.getBooleanExtra(WifiManager.EXTRA_MULTIPLE_NETWORKS_CHANGED,

                            false /* defaultValue */)) {

                        // only one network changed

                        WifiConfiguration wifiConfiguration = intent

                                .getParcelableExtra(WifiManager.EXTRA_WIFI_CONFIGURATION);

                        if (mAccessPoint.matches(wifiConfiguration)) {

                            mWifiConfig = wifiConfiguration;

                        }

                    }

                    updateMatchingWifiConfig();

                    // fall through

                case WifiManager.NETWORK_STATE_CHANGED_ACTION:

                case WifiManager.RSSI_CHANGED_ACTION:
@@ -230,6 +222,17 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController 
                    break;

            }

        }



        private void updateMatchingWifiConfig() {

            // use getPrivilegedConfiguredNetworks() to get Passpoint & other ephemeral networks

            for (WifiConfiguration wifiConfiguration :

                    mWifiManager.getPrivilegedConfiguredNetworks()) {

                if (mAccessPoint.matches(wifiConfiguration)) {

                    mWifiConfig = wifiConfiguration;

                    break;

                }

            }

        }

    };



    private final NetworkRequest mNetworkRequest = new NetworkRequest.Builder()