Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9f242da authored by Ahmed ElArabawy's avatar Ahmed ElArabawy
Browse files

Wifi: Make setScanningEnabled() a system API 

This commit makes the the API WifiScanner.setScanningEnabled() a System
API to allow priviliged apps to use it.

Bug: 140541571
Test: atest com.android.wifi.server
Change-Id: Id7377415699f2d8a8aea396889716dca1e23ecd5
parent 037af74e

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -5028,6 +5028,7 @@ package android.net.wifi { 
    method @NonNull @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public java.util.List<java.lang.Integer> getAvailableChannels(int);

    method @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public boolean getScanResults();

    method @NonNull @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public java.util.List<android.net.wifi.ScanResult> 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);

wifi/java/android/net/wifi/WifiScanner.java

+3 −4
Original line number Diff line number Diff line
@@ -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();