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

Commit ea1c3316 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 am: 8671dda9

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

Change-Id: I6cbef5e8424cccd99d23664daab6223e1604f9d8
parents 0af4fefb 8671dda9

core/api/system-current.txt

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

    method public void enableVerboseLogging(boolean);

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

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

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

    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 @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 @Nullable public android.net.wifi.nl80211.WifiNl80211Manager.TxPacketCounters getTxPacketCounters(@NonNull String);

    method public void notifyCountryCodeChanged(@Nullable String);

    method public void notifyCountryCodeChanged(@Nullable String);

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

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

     *

     * @param ifaceName Name of the interface.

     * @param ifaceName Name of the interface.

     */

     */

    public int getMaxNumScanSsids(@NonNull String ifaceName) {

    public int getMaxSsidsPerScan(@NonNull String ifaceName) {

        IWifiScannerImpl scannerImpl = getScannerImpl(ifaceName);

        IWifiScannerImpl scannerImpl = getScannerImpl(ifaceName);

        if (scannerImpl == null) {

        if (scannerImpl == null) {

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

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

            return 0;

            return 0;

        }

        }

        try {

        try {

            return scannerImpl.getMaxNumScanSsids();

            return scannerImpl.getMaxSsidsPerScan();

        } catch (RemoteException e1) {

        } catch (RemoteException e1) {

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

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

        }

        }

        return 0;

        return 0;

    }

    }