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

Commit 8671dda9 authored by Gabriel Biren's avatar Gabriel Biren Committed by Automerger Merge Worker
Browse files

Merge "Rename getMaxNumScanSsids to getMaxSsidsPerScan in WifiNl80211Manager."... 

Merge "Rename getMaxNumScanSsids to getMaxSsidsPerScan in WifiNl80211Manager." into tm-dev am: 3b623d4e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17145726

Change-Id: Iad04e691ce2204fc988216fe935263d1d5b23ca5
parents cbdd5e33 3b623d4e

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;

    }