diff --git a/api/system-current.txt b/api/system-current.txt index 77aff8dac3fa8..c4ae9a3dd6b42 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -5028,6 +5028,7 @@ package android.net.wifi { method @NonNull @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public java.util.List getAvailableChannels(int); method @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public boolean getScanResults(); method @NonNull @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public java.util.List getSingleScanResults(); + method @RequiresPermission(android.Manifest.permission.NETWORK_STACK) public void setScanningEnabled(boolean); method @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public void startBackgroundScan(android.net.wifi.WifiScanner.ScanSettings, android.net.wifi.WifiScanner.ScanListener); method @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public void startBackgroundScan(android.net.wifi.WifiScanner.ScanSettings, android.net.wifi.WifiScanner.ScanListener, android.os.WorkSource); method @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public void startScan(android.net.wifi.WifiScanner.ScanSettings, android.net.wifi.WifiScanner.ScanListener); diff --git a/wifi/java/android/net/wifi/WifiScanner.java b/wifi/java/android/net/wifi/WifiScanner.java index 771f3b8194984..0de506610ec1b 100644 --- a/wifi/java/android/net/wifi/WifiScanner.java +++ b/wifi/java/android/net/wifi/WifiScanner.java @@ -789,12 +789,11 @@ public class WifiScanner { /** * Enable/Disable wifi scanning. - * Note: WifiService calls this after any client interface mode changes (i.e. a new interface - * set up or an existing interface torn down) - * If there are >= 1 active client interface, invoke setScanningEnabled(true) - * If there are 0 active client interface, invoke setScanningEnabled(false) + * + * @param enable set to true to enable scanning, set to false to disable all types of scanning. * {@hide} */ + @SystemApi @RequiresPermission(Manifest.permission.NETWORK_STACK) public void setScanningEnabled(boolean enable) { validateChannel();