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

Commit 7c665f78 authored by Peter Qiu's avatar Peter Qiu Committed by android-build-merger
Browse files

Merge "wifi: catch UnsupportedOperationException for getMatchingWifiConfig"... 

Merge "wifi: catch UnsupportedOperationException for getMatchingWifiConfig" am: ae3bae71 am: 78eeb9b0
am: bc3fefba

Change-Id: I2fa6998d854ca61aa18ef2e61ed6a7196ed0be4d
parents 1d978329 bc3fefba

packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java

+7 −3
Original line number Diff line number Diff line
@@ -526,10 +526,14 @@ public class WifiTracker { 
                        // the given ScanResult.  This is used for showing that a given AP

                        // (ScanResult) is available via a Passpoint provider (provider friendly

                        // name).

                        try {

                            WifiConfiguration config = mWifiManager.getMatchingWifiConfig(result);

                            if (config != null) {

                                accessPoint.update(config);

                            }

                        } catch (UnsupportedOperationException e) {

                            // Passpoint not supported on the device.

                        }

                    }



                    accessPoints.add(accessPoint);