Merge "Add getMaxNumScanSsids() API to WifiNl80211Manager." into tm-dev (81e9b65c) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -9030,6 +9030,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 @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);

+19 −0

Original line number	Diff line number	Diff line
		@@ -962,6 +962,25 @@ public class WifiNl80211Manager {
		return results;
		}

		/**
		* 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}
		*/