Merge "wifi: catch UnsupportedOperationException for getMatchingWifiConfig" (ae3bae71) · Commits · e / os / android_frameworks_base

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

+7 −3

Original line number	Original line	Diff line number	Diff line
	@@ -394,10 +394,14 @@ public class WifiTracker {
	// the given ScanResult. This is used for showing that a given AP		// the given ScanResult. This is used for showing that a given AP
	// (ScanResult) is available via a Passpoint provider (provider friendly		// (ScanResult) is available via a Passpoint provider (provider friendly
	// name).		// name).
			try {
	WifiConfiguration config = mWifiManager.getMatchingWifiConfig(result);		WifiConfiguration config = mWifiManager.getMatchingWifiConfig(result);
	if (config != null) {		if (config != null) {
	accessPoint.update(config);		accessPoint.update(config);
	}		}
			} catch (UnsupportedOperationException e) {
			// Passpoint not supported on the device.
			}
	}		}

	accessPoints.add(accessPoint);		accessPoints.add(accessPoint);