Merge "wifi: Provide Scan failure reason codes to application" (7be7d95f) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+4 −2

Original line number	Diff line number	Diff line
		@@ -9499,7 +9499,8 @@ package android.net.wifi.nl80211 {
		method @Deprecated @Nullable public android.net.wifi.nl80211.WifiNl80211Manager.SignalPollResult signalPoll(@NonNull String);
		method public boolean startPnoScan(@NonNull String, @NonNull android.net.wifi.nl80211.PnoSettings, @NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.nl80211.WifiNl80211Manager.PnoScanRequestCallback);
		method @Deprecated public boolean startScan(@NonNull String, int, @Nullable java.util.Set<java.lang.Integer>, @Nullable java.util.List<byte[]>);
		method public boolean startScan(@NonNull String, int, @Nullable java.util.Set<java.lang.Integer>, @Nullable java.util.List<byte[]>, @Nullable android.os.Bundle);
		method @Deprecated public boolean startScan(@NonNull String, int, @Nullable java.util.Set<java.lang.Integer>, @Nullable java.util.List<byte[]>, @Nullable android.os.Bundle);
		method public int startScan2(@NonNull String, int, @Nullable java.util.Set<java.lang.Integer>, @Nullable java.util.List<byte[]>, @Nullable android.os.Bundle);
		method public boolean stopPnoScan(@NonNull String);
		method public boolean tearDownClientInterface(@NonNull String);
		method public boolean tearDownInterfaces();
		@@ -9533,7 +9534,8 @@ package android.net.wifi.nl80211 {
		}

		public static interface WifiNl80211Manager.ScanEventCallback {
		method public void onScanFailed();
		method @Deprecated public void onScanFailed();
		method public default void onScanFailed(int);
		method public void onScanResultReady();
		}

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

+86 −10

Original line number	Diff line number	Diff line
		@@ -137,9 +137,17 @@ public class WifiNl80211Manager {
		void onScanResultReady();

		/**
		* Deprecated in Android 14. Newer wificond implementation should call
		* onScanRequestFailed().
		* Called when a scan has failed.
		* @deprecated The usage is replaced by {@link ScanEventCallback#onScanFailed(int)}
		*/

		void onScanFailed();
		/**
		* Called when a scan has failed with errorCode.
		*/
		default void onScanFailed(int errorCode) {}
		}

		/**
		@@ -230,6 +238,18 @@ public class WifiNl80211Manager {
		Binder.restoreCallingIdentity(token);
		}
		}

		@Override
		public void OnScanRequestFailed(int errorCode) {
		Log.d(TAG, "Scan failed event with error code: " + errorCode);
		final long token = Binder.clearCallingIdentity();
		try {
		mExecutor.execute(() -> mCallback.onScanFailed(
		toFrameworkScanStatusCode(errorCode)));
		} finally {
		Binder.restoreCallingIdentity(token);
		}
		}
		}

		/**
		@@ -1029,6 +1049,32 @@ public class WifiNl80211Manager {
		return startScan(ifaceName, scanType, freqs, hiddenNetworkSSIDs, null);
		}

		/**
		* @deprecated replaced by {@link #startScan2(String, int, Set, List, Bundle)}
		*/
		@Deprecated
		public boolean startScan(@NonNull String ifaceName, @WifiAnnotations.ScanType int scanType,
		@SuppressLint("NullableCollection") @Nullable Set<Integer> freqs,
		@SuppressLint("NullableCollection") @Nullable List<byte[]> hiddenNetworkSSIDs,
		@SuppressLint("NullableCollection") @Nullable Bundle extraScanningParams) {
		IWifiScannerImpl scannerImpl = getScannerImpl(ifaceName);
		if (scannerImpl == null) {
		Log.e(TAG, "No valid wificond scanner interface handler for iface=" + ifaceName);
		return false;
		}
		SingleScanSettings settings = createSingleScanSettings(scanType, freqs, hiddenNetworkSSIDs,
		extraScanningParams);
		if (settings == null) {
		return false;
		}
		try {
		return scannerImpl.scan(settings);
		} catch (RemoteException e1) {
		Log.e(TAG, "Failed to request scan due to remote exception");
		}
		return false;
		}

		/**
		* Start a scan using the specified parameters. A scan is an asynchronous operation. The
		* result of the operation is returned in the {@link ScanEventCallback} registered when
		@@ -1049,24 +1095,41 @@ public class WifiNl80211Manager {
		* @param hiddenNetworkSSIDs List of hidden networks to be scanned for, a null indicates that
		* no hidden frequencies will be scanned for.
		* @param extraScanningParams bundle of extra scanning parameters.
		* @return Returns true on success, false on failure (e.g. when called before the interface
		* has been set up).
		* @return Returns one of the scan status codes defined in {@code WifiScanner#REASON_*}
		*/
		public boolean startScan(@NonNull String ifaceName, @WifiAnnotations.ScanType int scanType,
		public int startScan2(@NonNull String ifaceName, @WifiAnnotations.ScanType int scanType,
		@SuppressLint("NullableCollection") @Nullable Set<Integer> freqs,
		@SuppressLint("NullableCollection") @Nullable List<byte[]> hiddenNetworkSSIDs,
		@SuppressLint("NullableCollection") @Nullable Bundle extraScanningParams) {
		IWifiScannerImpl scannerImpl = getScannerImpl(ifaceName);
		if (scannerImpl == null) {
		Log.e(TAG, "No valid wificond scanner interface handler for iface=" + ifaceName);
		return false;
		return WifiScanner.REASON_INVALID_ARGS;
		}
		SingleScanSettings settings = createSingleScanSettings(scanType, freqs, hiddenNetworkSSIDs,
		extraScanningParams);
		if (settings == null) {
		return WifiScanner.REASON_INVALID_ARGS;
		}
		try {
		int status = scannerImpl.scanRequest(settings);
		return toFrameworkScanStatusCode(status);
		} catch (RemoteException e1) {
		Log.e(TAG, "Failed to request scan due to remote exception");
		}
		return WifiScanner.REASON_UNSPECIFIED;
		}

		private SingleScanSettings createSingleScanSettings(@WifiAnnotations.ScanType int scanType,
		@SuppressLint("NullableCollection") @Nullable Set<Integer> freqs,
		@SuppressLint("NullableCollection") @Nullable List<byte[]> hiddenNetworkSSIDs,
		@SuppressLint("NullableCollection") @Nullable Bundle extraScanningParams) {
		SingleScanSettings settings = new SingleScanSettings();
		try {
		settings.scanType = getScanType(scanType);
		} catch (IllegalArgumentException e) {
		Log.e(TAG, "Invalid scan type ", e);
		return false;
		return null;
		}
		settings.channelSettings = new ArrayList<>();
		settings.hiddenNetworks = new ArrayList<>();
		@@ -1094,12 +1157,25 @@ public class WifiNl80211Manager {
		}
		}

		try {
		return scannerImpl.scan(settings);
		} catch (RemoteException e1) {
		Log.e(TAG, "Failed to request scan due to remote exception");
		return settings;
		}

		private int toFrameworkScanStatusCode(int scanStatus) {
		switch(scanStatus) {
		case IWifiScannerImpl.SCAN_STATUS_SUCCESS:
		return WifiScanner.REASON_SUCCEEDED;
		case IWifiScannerImpl.SCAN_STATUS_FAILED_BUSY:
		return WifiScanner.REASON_BUSY;
		case IWifiScannerImpl.SCAN_STATUS_FAILED_ABORT:
		return WifiScanner.REASON_ABORT;
		case IWifiScannerImpl.SCAN_STATUS_FAILED_NODEV:
		return WifiScanner.REASON_NO_DEV;
		case IWifiScannerImpl.SCAN_STATUS_FAILED_INVALID_ARGS:
		return WifiScanner.REASON_INVALID_ARGS;
		case IWifiScannerImpl.SCAN_STATUS_FAILED_GENERIC:
		default:
		return WifiScanner.REASON_UNSPECIFIED;
		}
		return false;
		}

		/**