diff --git a/api/system-removed.txt b/api/system-removed.txt index f98d011faf776..a3bf576fb9a0a 100644 --- a/api/system-removed.txt +++ b/api/system-removed.txt @@ -142,10 +142,7 @@ package android.net.wifi { } public class WifiManager { - method public deprecated java.util.List getBatchedScanResults(); method public android.net.wifi.WifiConnectionStatistics getConnectionStatistics(); - method public deprecated boolean isBatchedScanSupported(); - method public deprecated boolean startLocationRestrictedScan(android.os.WorkSource); } } diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index 3700bdbd8329a..3b9121132f0b0 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -1614,53 +1614,6 @@ public class WifiManager { } } - /** - * startLocationRestrictedScan() - * Trigger a scan which will not make use of DFS channels and is thus not suitable for - * establishing wifi connection. - * @deprecated This API is nolonger supported. - * Use {@link android.net.wifi.WifiScanner} API - * @hide - * @removed - */ - @Deprecated - @SystemApi - @SuppressLint("Doclava125") - public boolean startLocationRestrictedScan(WorkSource workSource) { - return false; - } - - /** - * Check if the Batched Scan feature is supported. - * - * @return false if not supported. - * @deprecated This API is nolonger supported. - * Use {@link android.net.wifi.WifiScanner} API - * @hide - * @removed - */ - @Deprecated - @SystemApi - @SuppressLint("Doclava125") - public boolean isBatchedScanSupported() { - return false; - } - - /** - * Retrieve the latest batched scan result. This should be called immediately after - * {@link BATCHED_SCAN_RESULTS_AVAILABLE_ACTION} is received. - * @deprecated This API is nolonger supported. - * Use {@link android.net.wifi.WifiScanner} API - * @hide - * @removed - */ - @Deprecated - @SystemApi - @SuppressLint("Doclava125") - public List getBatchedScanResults() { - return null; - } - /** * Creates a configuration token describing the current network of MIME type * application/vnd.wfa.wsc. Can be used to configure WiFi networks via NFC.