Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Gabriel Biren
2022-03-10 15:47:30 +00:00
committed by Android (Google) Code Review
parent 6e3f7a9847 349940d9c7
commit 3b623d4e8a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/system-current.txt
View File

@@ -8993,7 +8993,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);

6
wifi/java/src/android/net/wifi/nl80211/WifiNl80211Manager.java
View File

@@ -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;
} }