commit 0f73d2fde01e7f7c1251adaac5c672c9e6e1872a
author Gabriel Biren <gbiren@google.com> Mon Feb 28 19:23:43 2022 +0000
committer Gabriel Biren <gbiren@google.com> Mon Mar 07 23:32:45 2022 +0000
tree 6bd2716511e80522f4370d6b7fe0f4b2821bb54f
parent 199d49a834b031b3f66fa170f537b5b225ae14e1

Add getMaxNumScanSsids() API to WifiNl80211Manager.

Bug: 140003257
Test: atest WificondScannerTest

Change-Id: Ibecc0b322b51ea96e4f378331756554eabdef1d4

core/api/system-current.txt

diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index e18a308..bdcb1e3 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -8987,6 +8987,7 @@
     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 @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

diff --git a/wifi/java/src/android/net/wifi/nl80211/WifiNl80211Manager.java b/wifi/java/src/android/net/wifi/nl80211/WifiNl80211Manager.java
index 9604475..8630ec4 100644
--- a/wifi/java/src/android/net/wifi/nl80211/WifiNl80211Manager.java
+++ b/wifi/java/src/android/net/wifi/nl80211/WifiNl80211Manager.java
@@ -963,6 +963,25 @@
     }
 
     /**
+     * Get the max number of SSIDs that the driver supports per scan.
+     *
+     * @param ifaceName Name of the interface.
+     */
+    public int getMaxNumScanSsids(@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();
+        } catch (RemoteException e1) {
+            Log.e(TAG, "Failed to getMaxNumScanSsids");
+        }
+        return 0;
+    }
+
+    /**
      * Return scan type for the parcelable {@link SingleScanSettings}
      */
     private static int getScanType(@WifiAnnotations.ScanType int scanType) {