Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "wifi: catch UnsupportedOperationException for getMatchingWifiConfig" am: ae3bae715e am: 78eeb9b090

Browse Source 
am: bc3fefbacd

Change-Id: I2fa6998d854ca61aa18ef2e61ed6a7196ed0be4d
This commit is contained in:
Peter Qiu
2017-03-27 21:38:26 +00:00
committed by android-build-merger
parent 1d978329df bc3fefbacd
commit 7c665f783f
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java
View File

@@ -526,9 +526,13 @@ 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).
WifiConfiguration config = mWifiManager.getMatchingWifiConfig(result);
if (config != null) {
accessPoint.update(config);
try {
WifiConfiguration config = mWifiManager.getMatchingWifiConfig(result);
if (config != null) {
accessPoint.update(config);
}
} catch (UnsupportedOperationException e) {
// Passpoint not supported on the device.
}
}