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

Commit 3b623d4e authored by Gabriel Biren's avatar Gabriel Biren Committed by Android (Google) Code Review
Browse files

Merge "Rename getMaxNumScanSsids to getMaxSsidsPerScan in WifiNl80211Manager." into tm-dev

parents 6e3f7a98 349940d9

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -8993,7 +8993,7 @@ package android.net.wifi.nl80211 { 
    method public void enableVerboseLogging(boolean);

    method @NonNull public int[] getChannelsMhzForBand(int);

    method @Nullable public android.net.wifi.nl80211.DeviceWiphyCapabilities getDeviceWiphyCapabilities(@NonNull String);

    method public int getMaxNumScanSsids(@NonNull String);

    method public int getMaxSsidsPerScan(@NonNull String);

    method @NonNull public java.util.List<android.net.wifi.nl80211.NativeScanResult> getScanResults(@NonNull String, int);

    method @Nullable public android.net.wifi.nl80211.WifiNl80211Manager.TxPacketCounters getTxPacketCounters(@NonNull String);

    method public void notifyCountryCodeChanged(@Nullable String);

wifi/java/src/android/net/wifi/nl80211/WifiNl80211Manager.java

+3 −3
Original line number Diff line number Diff line
@@ -967,16 +967,16 @@ public class WifiNl80211Manager { 
     *

     * @param ifaceName Name of the interface.

     */

    public int getMaxNumScanSsids(@NonNull String ifaceName) {

    public int getMaxSsidsPerScan(@NonNull String ifaceName) {

        IWifiScannerImpl scannerImpl = getScannerImpl(ifaceName);

        if (scannerImpl == null) {

            Log.e(TAG, "No valid wificond scanner interface handler for iface=" + ifaceName);

            return 0;

        }

        try {

            return scannerImpl.getMaxNumScanSsids();

            return scannerImpl.getMaxSsidsPerScan();

        } catch (RemoteException e1) {

            Log.e(TAG, "Failed to getMaxNumScanSsids");

            Log.e(TAG, "Failed to getMaxSsidsPerScan");

        }

        return 0;

    }