diff options
| author | Michael Brüning <michael.bruning@qt.io> | 2019-09-26 12:57:40 +0200 |
|---|---|---|
| committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2019-10-09 13:21:44 +0000 |
| commit | 3449634e50a8bc18b35aa28d06b17540cbb00ffe (patch) | |
| tree | 56bcfa552a0cac17db67c6012f44d71c4d1a1f7f | |
| parent | be2b74f4ab835573362a012047c76508973bd065 (diff) | |
| download | qtwebengine-chromium-3449634e50a8bc18b35aa28d06b17540cbb00ffe.tar.gz | |
Fix use of deprecated method for scanning wifi networks
scanForNetworksWithParameters has ben removed in the sdk that ships
with XCode 11. Replace its use with scanForNetworksWithName.
The results should be the same.
Task-number: QTBUG-78997
Change-Id: Ifaeb6b380d02364133280b44644ae8ca1e51119a
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
(cherry picked from commit 1f1bd0af331476d46fe69ceb6df14b82f98cd54d)
Reviewed-by: Dmitriy Kuminov <coding@dmik.org>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | chromium/services/device/geolocation/wifi_data_provider_mac.mm | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/chromium/services/device/geolocation/wifi_data_provider_mac.mm b/chromium/services/device/geolocation/wifi_data_provider_mac.mm index 278a5385708..1b53ce41c42 100644 --- a/chromium/services/device/geolocation/wifi_data_provider_mac.mm +++ b/chromium/services/device/geolocation/wifi_data_provider_mac.mm @@ -22,10 +22,8 @@ #include "services/device/geolocation/wifi_data_provider_common.h" #include "services/device/geolocation/wifi_data_provider_manager.h" -extern "C" NSString* const kCWScanKeyMerge; - @interface CWInterface (Private) -- (NSArray*)scanForNetworksWithParameters:(NSDictionary*)params +- (NSSet<CWNetwork *> *)scanForNetworksWithName:(NSString *)networkName error:(NSError**)error; @end @@ -46,9 +44,6 @@ class CoreWlanApi : public WifiDataProviderCommon::WlanApiInterface { bool CoreWlanApi::GetAccessPointData(WifiData::AccessPointDataSet* data) { base::mac::ScopedNSAutoreleasePool auto_pool; - // Initialize the scan parameters with scan key merging disabled, so we get - // every AP listed in the scan without any SSID de-duping logic. - NSDictionary* params = @{ kCWScanKeyMerge : @NO }; NSSet* supported_interfaces = [CWInterface interfaceNames]; NSUInteger interface_error_count = 0; @@ -64,8 +59,8 @@ bool CoreWlanApi::GetAccessPointData(WifiData::AccessPointDataSet* data) { const base::TimeTicks start_time = base::TimeTicks::Now(); NSError* err = nil; - NSArray* scan = - [corewlan_interface scanForNetworksWithParameters:params error:&err]; + NSSet<CWNetwork *>* scan = + [corewlan_interface scanForNetworksWithName:nil error:&err]; const int error_code = [err code]; const int count = [scan count]; // We could get an error code but count != 0 if the scan was interrupted, |