wifi(interface): Move all StaIface types to types.hal
Some of these structs are used in the debug framework and hence needs to
live in types.hal. Add a |Sta| prefix to differentiate them from other
types similar to what is done for Nan and Rtt types.
Bug: 31991459
Test: ./hardware/interfaces/update-makefiles.sh
Change-Id: Idc49b28447609c4334b0a086481c404c06a63fea
diff --git a/wifi/1.0/IWifiStaIfaceEventCallback.hal b/wifi/1.0/IWifiStaIfaceEventCallback.hal
index 6bffc7d..d47d40c 100644
--- a/wifi/1.0/IWifiStaIfaceEventCallback.hal
+++ b/wifi/1.0/IWifiStaIfaceEventCallback.hal
@@ -18,52 +18,6 @@
interface IWifiStaIfaceEventCallback {
/**
- * Structure describing all the information about a single access point seen
- * during the scan.
- */
- struct ScanResult {
- TimeStampInUs timeStampInUs;
- vec<uint8_t> ssid;
- Bssid bssid;
- Rssi rssi;
- WifiChannelInMhz frequency;
- uint16_t beaconPeriodInMs;
- uint16_t capability;
- vec<WifiInformationElement> informationElements;
- };
-
- /**
- * Mask of flags set in the |ScanData| instance.
- */
- enum ScanDataFlagMask {
- /**
- * Indicates that a scan was interrupted/did not occur so results may be
- * incomplete.
- */
- WIFI_SCAN_FLAG_INTERRUPTED = 1 << 0,
- };
-
- /**
- * Structure describing all the information about all the access points seen during
- * the scan.
- */
- struct ScanData {
- /**
- * Bitset containing |ScanDataFlagMask| values.
- */
- uint32_t flags;
- /**
- * Bitset where each bit indicates if the bucket with that index was
- * scanned.
- */
- uint32_t bucketsScanned;
- /**
- * List of scan results.
- */
- vec<ScanResult> results;
- };
-
- /**
* Callback indicating that an ongoing background scan request has failed.
* The background scan needs to be restarted to continue scanning.
*/
@@ -72,15 +26,15 @@
/**
* Called for each received beacon/probe response for a scan with the
* |REPORT_EVENTS_FULL_RESULTS| flag set in
- * |BackgroundScanBucketParameters.eventReportScheme|.
+ * |StaBackgroundScanBucketParameters.eventReportScheme|.
*
* @param cmdId command Id corresponding to the request.
* @parm result Full scan result for an AP.
*/
- oneway onBackgroundFullScanResult(CommandId cmdId, ScanResult result);
+ oneway onBackgroundFullScanResult(CommandId cmdId, StaScanResult result);
/**
- * Called when the |BackgroundScanBucketParameters.eventReportScheme| flags
+ * Called when the |StaBackgroundScanBucketParameters.eventReportScheme| flags
* for at least one bucket that was just scanned was
* |REPORT_EVENTS_EACH_SCAN| or one of the configured thresholds was
* breached.
@@ -88,5 +42,5 @@
* @param cmdId command Id corresponding to the request.
* @parm scanDatas List of scan result for all AP's seen since last callback.
*/
- oneway onBackgroundScanResults(CommandId cmdId, vec<ScanData> scanDatas);
+ oneway onBackgroundScanResults(CommandId cmdId, vec<StaScanData> scanDatas);
};