Add AIDL definitions for NAN suspension.
Bug: 259950106
Test: Not tested.
Change-Id: I0194fc2a1d9f57ca6ba14f76f5453264e3af3cca
diff --git a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/IWifiNanIface.aidl b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/IWifiNanIface.aidl
index 3dff5bf..b20f505 100644
--- a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/IWifiNanIface.aidl
+++ b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/IWifiNanIface.aidl
@@ -49,6 +49,8 @@
void stopPublishRequest(in char cmdId, in byte sessionId);
void stopSubscribeRequest(in char cmdId, in byte sessionId);
void terminateDataPathRequest(in char cmdId, in int ndpInstanceId);
+ void suspendRequest(in char cmdId, in byte sessionId);
+ void resumeRequest(in char cmdId, in byte sessionId);
void transmitFollowupRequest(in char cmdId, in android.hardware.wifi.NanTransmitFollowupRequest msg);
void initiatePairingRequest(in char cmdId, in android.hardware.wifi.NanPairingRequest msg);
void respondToPairingIndicationRequest(in char cmdId, in android.hardware.wifi.NanRespondToPairingIndicationRequest msg);
diff --git a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/IWifiNanIfaceEventCallback.aidl b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/IWifiNanIfaceEventCallback.aidl
index b6c9d1f..dfb28aa 100644
--- a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/IWifiNanIfaceEventCallback.aidl
+++ b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/IWifiNanIfaceEventCallback.aidl
@@ -59,6 +59,8 @@
oneway void notifyStopPublishResponse(in char id, in android.hardware.wifi.NanStatus status);
oneway void notifyStopSubscribeResponse(in char id, in android.hardware.wifi.NanStatus status);
oneway void notifyTerminateDataPathResponse(in char id, in android.hardware.wifi.NanStatus status);
+ oneway void notifySuspendResponse(in char id, in android.hardware.wifi.NanStatus status);
+ oneway void notifyResumeResponse(in char id, in android.hardware.wifi.NanStatus status);
oneway void notifyTransmitFollowupResponse(in char id, in android.hardware.wifi.NanStatus status);
oneway void eventPairingRequest(in android.hardware.wifi.NanPairingRequestInd event);
oneway void eventPairingConfirm(in android.hardware.wifi.NanPairingConfirmInd event);
diff --git a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/IWifiStaIface.aidl b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/IWifiStaIface.aidl
index ac5b93b..9a4c050 100644
--- a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/IWifiStaIface.aidl
+++ b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/IWifiStaIface.aidl
@@ -64,20 +64,20 @@
void setDtimMultiplier(in int multiplier);
@Backing(type="int") @VintfStability
enum StaIfaceCapabilityMask {
- APF = 1,
- BACKGROUND_SCAN = 2,
- LINK_LAYER_STATS = 4,
- RSSI_MONITOR = 8,
- CONTROL_ROAMING = 16,
- PROBE_IE_ALLOWLIST = 32,
- SCAN_RAND = 64,
- STA_5G = 128,
- HOTSPOT = 256,
- PNO = 512,
- TDLS = 1024,
- TDLS_OFFCHANNEL = 2048,
- ND_OFFLOAD = 4096,
- KEEP_ALIVE = 8192,
- DEBUG_PACKET_FATE = 16384,
+ APF = (1 << 0),
+ BACKGROUND_SCAN = (1 << 1),
+ LINK_LAYER_STATS = (1 << 2),
+ RSSI_MONITOR = (1 << 3),
+ CONTROL_ROAMING = (1 << 4),
+ PROBE_IE_ALLOWLIST = (1 << 5),
+ SCAN_RAND = (1 << 6),
+ STA_5G = (1 << 7),
+ HOTSPOT = (1 << 8),
+ PNO = (1 << 9),
+ TDLS = (1 << 10),
+ TDLS_OFFCHANNEL = (1 << 11),
+ ND_OFFLOAD = (1 << 12),
+ KEEP_ALIVE = (1 << 13),
+ DEBUG_PACKET_FATE = (1 << 14),
}
}
diff --git a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/IfaceConcurrencyType.aidl b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/IfaceConcurrencyType.aidl
index 0a3ad1a..d584423 100644
--- a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/IfaceConcurrencyType.aidl
+++ b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/IfaceConcurrencyType.aidl
@@ -34,9 +34,9 @@
package android.hardware.wifi;
@Backing(type="int") @VintfStability
enum IfaceConcurrencyType {
- STA = 0,
- AP = 1,
- AP_BRIDGED = 2,
- P2P = 3,
- NAN_IFACE = 4,
+ STA,
+ AP,
+ AP_BRIDGED,
+ P2P,
+ NAN_IFACE,
}
diff --git a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/IfaceType.aidl b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/IfaceType.aidl
index dbdc439..67022df 100644
--- a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/IfaceType.aidl
+++ b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/IfaceType.aidl
@@ -34,8 +34,8 @@
package android.hardware.wifi;
@Backing(type="int") @VintfStability
enum IfaceType {
- STA = 0,
- AP = 1,
- P2P = 2,
- NAN_IFACE = 3,
+ STA,
+ AP,
+ P2P,
+ NAN_IFACE,
}
diff --git a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanBandIndex.aidl b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanBandIndex.aidl
index ca6c910..3f1ea5e 100644
--- a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanBandIndex.aidl
+++ b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanBandIndex.aidl
@@ -35,6 +35,6 @@
@Backing(type="int") @VintfStability
enum NanBandIndex {
NAN_BAND_24GHZ = 0,
- NAN_BAND_5GHZ = 1,
+ NAN_BAND_5GHZ,
NAN_BAND_6GHZ = 2,
}
diff --git a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanBootstrappingMethod.aidl b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanBootstrappingMethod.aidl
index e5f0975..1504534 100644
--- a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanBootstrappingMethod.aidl
+++ b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanBootstrappingMethod.aidl
@@ -34,15 +34,15 @@
package android.hardware.wifi;
@Backing(type="int") @VintfStability
enum NanBootstrappingMethod {
- BOOTSTRAPPING_OPPORTUNISTIC_MASK = 1,
- BOOTSTRAPPING_PIN_CODE_DISPLAY_MASK = 2,
- BOOTSTRAPPING_PASSPHRASE_DISPLAY_MASK = 4,
- BOOTSTRAPPING_QR_DISPLAY_MASK = 8,
- BOOTSTRAPPING_NFC_TAG_MASK = 16,
- BOOTSTRAPPING_PIN_CODE_KEYPAD_MASK = 32,
- BOOTSTRAPPING_PASSPHRASE_KEYPAD_MASK = 64,
- BOOTSTRAPPING_QR_SCAN_MASK = 128,
- BOOTSTRAPPING_NFC_READER_MASK = 256,
- BOOTSTRAPPING_SERVICE_MANAGED_MASK = 16384,
- BOOTSTRAPPING_HANDSHAKE_SHIP_MASK = 32768,
+ BOOTSTRAPPING_OPPORTUNISTIC_MASK = (1 << 0),
+ BOOTSTRAPPING_PIN_CODE_DISPLAY_MASK = (1 << 1),
+ BOOTSTRAPPING_PASSPHRASE_DISPLAY_MASK = (1 << 2),
+ BOOTSTRAPPING_QR_DISPLAY_MASK = (1 << 3),
+ BOOTSTRAPPING_NFC_TAG_MASK = (1 << 4),
+ BOOTSTRAPPING_PIN_CODE_KEYPAD_MASK = (1 << 5),
+ BOOTSTRAPPING_PASSPHRASE_KEYPAD_MASK = (1 << 6),
+ BOOTSTRAPPING_QR_SCAN_MASK = (1 << 7),
+ BOOTSTRAPPING_NFC_READER_MASK = (1 << 8),
+ BOOTSTRAPPING_SERVICE_MANAGED_MASK = (1 << 14),
+ BOOTSTRAPPING_HANDSHAKE_SHIP_MASK = (1 << 15),
}
diff --git a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanCipherSuiteType.aidl b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanCipherSuiteType.aidl
index 4450956..e98122d 100644
--- a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanCipherSuiteType.aidl
+++ b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanCipherSuiteType.aidl
@@ -35,8 +35,8 @@
@Backing(type="int") @VintfStability
enum NanCipherSuiteType {
NONE = 0,
- SHARED_KEY_128_MASK = 1,
- SHARED_KEY_256_MASK = 2,
- PUBLIC_KEY_128_MASK = 4,
- PUBLIC_KEY_256_MASK = 8,
+ SHARED_KEY_128_MASK = (1 << 0),
+ SHARED_KEY_256_MASK = (1 << 1),
+ PUBLIC_KEY_128_MASK = (1 << 2),
+ PUBLIC_KEY_256_MASK = (1 << 3),
}
diff --git a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanClusterEventType.aidl b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanClusterEventType.aidl
index 1dfa45f..6c20543 100644
--- a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanClusterEventType.aidl
+++ b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanClusterEventType.aidl
@@ -35,6 +35,6 @@
@Backing(type="int") @VintfStability
enum NanClusterEventType {
DISCOVERY_MAC_ADDRESS_CHANGED = 0,
- STARTED_CLUSTER = 1,
- JOINED_CLUSTER = 2,
+ STARTED_CLUSTER,
+ JOINED_CLUSTER,
}
diff --git a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanDataPathChannelCfg.aidl b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanDataPathChannelCfg.aidl
index ce75288..4233c32 100644
--- a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanDataPathChannelCfg.aidl
+++ b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanDataPathChannelCfg.aidl
@@ -35,6 +35,6 @@
@Backing(type="int") @VintfStability
enum NanDataPathChannelCfg {
CHANNEL_NOT_REQUESTED = 0,
- REQUEST_CHANNEL_SETUP = 1,
- FORCE_CHANNEL_SETUP = 2,
+ REQUEST_CHANNEL_SETUP,
+ FORCE_CHANNEL_SETUP,
}
diff --git a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanDataPathSecurityType.aidl b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanDataPathSecurityType.aidl
index 64288ca..cb7904d 100644
--- a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanDataPathSecurityType.aidl
+++ b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanDataPathSecurityType.aidl
@@ -34,7 +34,7 @@
package android.hardware.wifi;
@Backing(type="int") @VintfStability
enum NanDataPathSecurityType {
- OPEN = 0,
- PMK = 1,
- PASSPHRASE = 2,
+ OPEN,
+ PMK,
+ PASSPHRASE,
}
diff --git a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanMatchAlg.aidl b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanMatchAlg.aidl
index dab33ad..93ac26b 100644
--- a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanMatchAlg.aidl
+++ b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanMatchAlg.aidl
@@ -35,6 +35,6 @@
@Backing(type="int") @VintfStability
enum NanMatchAlg {
MATCH_ONCE = 0,
- MATCH_CONTINUOUS = 1,
- MATCH_NEVER = 2,
+ MATCH_CONTINUOUS,
+ MATCH_NEVER,
}
diff --git a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanPairingRequestType.aidl b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanPairingRequestType.aidl
index 9e73e80..3488340 100644
--- a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanPairingRequestType.aidl
+++ b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanPairingRequestType.aidl
@@ -35,5 +35,5 @@
@Backing(type="int") @VintfStability
enum NanPairingRequestType {
NAN_PAIRING_SETUP = 0,
- NAN_PAIRING_VERIFICATION = 1,
+ NAN_PAIRING_VERIFICATION,
}
diff --git a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanPairingSecurityType.aidl b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanPairingSecurityType.aidl
index a08a00f..9f6c774 100644
--- a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanPairingSecurityType.aidl
+++ b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanPairingSecurityType.aidl
@@ -34,7 +34,7 @@
package android.hardware.wifi;
@Backing(type="int") @VintfStability
enum NanPairingSecurityType {
- OPPORTUNISTIC = 0,
- PMK = 1,
- PASSPHRASE = 2,
+ OPPORTUNISTIC,
+ PMK,
+ PASSPHRASE,
}
diff --git a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanPublishType.aidl b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanPublishType.aidl
index fc9b7a0..30dffb2 100644
--- a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanPublishType.aidl
+++ b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanPublishType.aidl
@@ -35,6 +35,6 @@
@Backing(type="int") @VintfStability
enum NanPublishType {
UNSOLICITED = 0,
- SOLICITED = 1,
- UNSOLICITED_SOLICITED = 2,
+ SOLICITED,
+ UNSOLICITED_SOLICITED,
}
diff --git a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanRangingIndication.aidl b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanRangingIndication.aidl
index d03dffc..4d33c10 100644
--- a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanRangingIndication.aidl
+++ b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanRangingIndication.aidl
@@ -34,7 +34,7 @@
package android.hardware.wifi;
@Backing(type="int") @VintfStability
enum NanRangingIndication {
- CONTINUOUS_INDICATION_MASK = 1,
- INGRESS_MET_MASK = 2,
- EGRESS_MET_MASK = 4,
+ CONTINUOUS_INDICATION_MASK = (1 << 0),
+ INGRESS_MET_MASK = (1 << 1),
+ EGRESS_MET_MASK = (1 << 2),
}
diff --git a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanSrfType.aidl b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanSrfType.aidl
index 3c0583c..82409fd 100644
--- a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanSrfType.aidl
+++ b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanSrfType.aidl
@@ -35,5 +35,5 @@
@Backing(type="int") @VintfStability
enum NanSrfType {
BLOOM_FILTER = 0,
- PARTIAL_MAC_ADDR = 1,
+ PARTIAL_MAC_ADDR,
}
diff --git a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanStatusCode.aidl b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanStatusCode.aidl
index 0fe2245..40844cc 100644
--- a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanStatusCode.aidl
+++ b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanStatusCode.aidl
@@ -49,4 +49,5 @@
UNSUPPORTED_CONCURRENCY_NAN_DISABLED = 12,
INVALID_PAIRING_ID = 13,
INVALID_BOOTSTRAPPING_ID = 14,
+ INVALID_STATE = 15,
}
diff --git a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanSubscribeType.aidl b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanSubscribeType.aidl
index 325e40b..4f06df9 100644
--- a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanSubscribeType.aidl
+++ b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanSubscribeType.aidl
@@ -35,5 +35,5 @@
@Backing(type="int") @VintfStability
enum NanSubscribeType {
PASSIVE = 0,
- ACTIVE = 1,
+ ACTIVE,
}
diff --git a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanTxType.aidl b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanTxType.aidl
index 6f7696f..798d3a2 100644
--- a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanTxType.aidl
+++ b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/NanTxType.aidl
@@ -35,5 +35,5 @@
@Backing(type="int") @VintfStability
enum NanTxType {
BROADCAST = 0,
- UNICAST = 1,
+ UNICAST,
}
diff --git a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/RttBw.aidl b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/RttBw.aidl
index f5bf894..7cc7002 100644
--- a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/RttBw.aidl
+++ b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/RttBw.aidl
@@ -34,12 +34,12 @@
package android.hardware.wifi;
@Backing(type="int") @VintfStability
enum RttBw {
- BW_UNSPECIFIED = 0,
- BW_5MHZ = 1,
- BW_10MHZ = 2,
- BW_20MHZ = 4,
- BW_40MHZ = 8,
- BW_80MHZ = 16,
- BW_160MHZ = 32,
- BW_320MHZ = 64,
+ BW_UNSPECIFIED = 0x0,
+ BW_5MHZ = 0x01,
+ BW_10MHZ = 0x02,
+ BW_20MHZ = 0x04,
+ BW_40MHZ = 0x08,
+ BW_80MHZ = 0x10,
+ BW_160MHZ = 0x20,
+ BW_320MHZ = 0x40,
}
diff --git a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/RttPreamble.aidl b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/RttPreamble.aidl
index 02e6479..de26f28 100644
--- a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/RttPreamble.aidl
+++ b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/RttPreamble.aidl
@@ -34,9 +34,9 @@
package android.hardware.wifi;
@Backing(type="int") @VintfStability
enum RttPreamble {
- LEGACY = 1,
- HT = 2,
- VHT = 4,
- HE = 8,
- EHT = 16,
+ LEGACY = 0x1,
+ HT = 0x2,
+ VHT = 0x4,
+ HE = 0x8,
+ EHT = 0x10,
}
diff --git a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/StaBackgroundScanBucketEventReportSchemeMask.aidl b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/StaBackgroundScanBucketEventReportSchemeMask.aidl
index 1041dd7..93e337e 100644
--- a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/StaBackgroundScanBucketEventReportSchemeMask.aidl
+++ b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/StaBackgroundScanBucketEventReportSchemeMask.aidl
@@ -34,7 +34,7 @@
package android.hardware.wifi;
@Backing(type="int") @VintfStability
enum StaBackgroundScanBucketEventReportSchemeMask {
- EACH_SCAN = 1,
- FULL_RESULTS = 2,
- NO_BATCH = 4,
+ EACH_SCAN = (1 << 0),
+ FULL_RESULTS = (1 << 1),
+ NO_BATCH = (1 << 2),
}
diff --git a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/StaScanDataFlagMask.aidl b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/StaScanDataFlagMask.aidl
index dc8f2f1..fbd2d75 100644
--- a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/StaScanDataFlagMask.aidl
+++ b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/StaScanDataFlagMask.aidl
@@ -34,5 +34,5 @@
package android.hardware.wifi;
@Backing(type="int") @VintfStability
enum StaScanDataFlagMask {
- INTERRUPTED = 1,
+ INTERRUPTED = (1 << 0),
}
diff --git a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/WifiChannelWidthInMhz.aidl b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/WifiChannelWidthInMhz.aidl
index 8c45044..22327e5 100644
--- a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/WifiChannelWidthInMhz.aidl
+++ b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/WifiChannelWidthInMhz.aidl
@@ -34,7 +34,7 @@
package android.hardware.wifi;
@Backing(type="int") @VintfStability
enum WifiChannelWidthInMhz {
- WIDTH_INVALID = -1,
+ WIDTH_INVALID = (-1),
WIDTH_20 = 0,
WIDTH_40 = 1,
WIDTH_80 = 2,
diff --git a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/WifiDebugPacketFateFrameType.aidl b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/WifiDebugPacketFateFrameType.aidl
index ee26f2e..6db96ef 100644
--- a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/WifiDebugPacketFateFrameType.aidl
+++ b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/WifiDebugPacketFateFrameType.aidl
@@ -34,7 +34,7 @@
package android.hardware.wifi;
@Backing(type="int") @VintfStability
enum WifiDebugPacketFateFrameType {
- UNKNOWN = 0,
- ETHERNET_II = 1,
- MGMT_80211 = 2,
+ UNKNOWN,
+ ETHERNET_II,
+ MGMT_80211,
}
diff --git a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/WifiDebugRingBufferFlags.aidl b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/WifiDebugRingBufferFlags.aidl
index f210e82..9eac85d 100644
--- a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/WifiDebugRingBufferFlags.aidl
+++ b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/WifiDebugRingBufferFlags.aidl
@@ -34,7 +34,7 @@
package android.hardware.wifi;
@Backing(type="int") @VintfStability
enum WifiDebugRingBufferFlags {
- HAS_BINARY_ENTRIES = 1,
- HAS_ASCII_ENTRIES = 2,
- HAS_PER_PACKET_ENTRIES = 4,
+ HAS_BINARY_ENTRIES = (1 << 0),
+ HAS_ASCII_ENTRIES = (1 << 1),
+ HAS_PER_PACKET_ENTRIES = (1 << 2),
}
diff --git a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/WifiDebugRxPacketFate.aidl b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/WifiDebugRxPacketFate.aidl
index 75abb4e..f638c4f 100644
--- a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/WifiDebugRxPacketFate.aidl
+++ b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/WifiDebugRxPacketFate.aidl
@@ -34,15 +34,15 @@
package android.hardware.wifi;
@Backing(type="int") @VintfStability
enum WifiDebugRxPacketFate {
- SUCCESS = 0,
- FW_QUEUED = 1,
- FW_DROP_FILTER = 2,
- FW_DROP_INVALID = 3,
- FW_DROP_NOBUFS = 4,
- FW_DROP_OTHER = 5,
- DRV_QUEUED = 6,
- DRV_DROP_FILTER = 7,
- DRV_DROP_INVALID = 8,
- DRV_DROP_NOBUFS = 9,
- DRV_DROP_OTHER = 10,
+ SUCCESS,
+ FW_QUEUED,
+ FW_DROP_FILTER,
+ FW_DROP_INVALID,
+ FW_DROP_NOBUFS,
+ FW_DROP_OTHER,
+ DRV_QUEUED,
+ DRV_DROP_FILTER,
+ DRV_DROP_INVALID,
+ DRV_DROP_NOBUFS,
+ DRV_DROP_OTHER,
}
diff --git a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/WifiDebugTxPacketFate.aidl b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/WifiDebugTxPacketFate.aidl
index e360c2c..778ca5d 100644
--- a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/WifiDebugTxPacketFate.aidl
+++ b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/WifiDebugTxPacketFate.aidl
@@ -34,14 +34,14 @@
package android.hardware.wifi;
@Backing(type="int") @VintfStability
enum WifiDebugTxPacketFate {
- ACKED = 0,
- SENT = 1,
- FW_QUEUED = 2,
- FW_DROP_INVALID = 3,
- FW_DROP_NOBUFS = 4,
- FW_DROP_OTHER = 5,
- DRV_QUEUED = 6,
- DRV_DROP_INVALID = 7,
- DRV_DROP_NOBUFS = 8,
- DRV_DROP_OTHER = 9,
+ ACKED,
+ SENT,
+ FW_QUEUED,
+ FW_DROP_INVALID,
+ FW_DROP_NOBUFS,
+ FW_DROP_OTHER,
+ DRV_QUEUED,
+ DRV_DROP_INVALID,
+ DRV_DROP_NOBUFS,
+ DRV_DROP_OTHER,
}
diff --git a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/WifiIfaceMode.aidl b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/WifiIfaceMode.aidl
index e2fe57a..2ac0c2d 100644
--- a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/WifiIfaceMode.aidl
+++ b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/WifiIfaceMode.aidl
@@ -34,12 +34,12 @@
package android.hardware.wifi;
@Backing(type="int") @VintfStability
enum WifiIfaceMode {
- IFACE_MODE_STA = 1,
- IFACE_MODE_SOFTAP = 2,
- IFACE_MODE_IBSS = 4,
- IFACE_MODE_P2P_CLIENT = 8,
- IFACE_MODE_P2P_GO = 16,
- IFACE_MODE_NAN = 32,
- IFACE_MODE_MESH = 64,
- IFACE_MODE_TDLS = 128,
+ IFACE_MODE_STA = (1 << 0),
+ IFACE_MODE_SOFTAP = (1 << 1),
+ IFACE_MODE_IBSS = (1 << 2),
+ IFACE_MODE_P2P_CLIENT = (1 << 3),
+ IFACE_MODE_P2P_GO = (1 << 4),
+ IFACE_MODE_NAN = (1 << 5),
+ IFACE_MODE_MESH = (1 << 6),
+ IFACE_MODE_TDLS = (1 << 7),
}
diff --git a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/WifiStatusCode.aidl b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/WifiStatusCode.aidl
index f27661c..9a15fa1 100644
--- a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/WifiStatusCode.aidl
+++ b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/WifiStatusCode.aidl
@@ -34,14 +34,14 @@
package android.hardware.wifi;
@Backing(type="int") @VintfStability
enum WifiStatusCode {
- SUCCESS = 0,
- ERROR_WIFI_CHIP_INVALID = 1,
- ERROR_WIFI_IFACE_INVALID = 2,
- ERROR_WIFI_RTT_CONTROLLER_INVALID = 3,
- ERROR_NOT_SUPPORTED = 4,
- ERROR_NOT_AVAILABLE = 5,
- ERROR_NOT_STARTED = 6,
- ERROR_INVALID_ARGS = 7,
- ERROR_BUSY = 8,
- ERROR_UNKNOWN = 9,
+ SUCCESS,
+ ERROR_WIFI_CHIP_INVALID,
+ ERROR_WIFI_IFACE_INVALID,
+ ERROR_WIFI_RTT_CONTROLLER_INVALID,
+ ERROR_NOT_SUPPORTED,
+ ERROR_NOT_AVAILABLE,
+ ERROR_NOT_STARTED,
+ ERROR_INVALID_ARGS,
+ ERROR_BUSY,
+ ERROR_UNKNOWN,
}
diff --git a/wifi/aidl/android/hardware/wifi/IWifiNanIface.aidl b/wifi/aidl/android/hardware/wifi/IWifiNanIface.aidl
index 31c7ece..870c3d8 100644
--- a/wifi/aidl/android/hardware/wifi/IWifiNanIface.aidl
+++ b/wifi/aidl/android/hardware/wifi/IWifiNanIface.aidl
@@ -241,6 +241,32 @@
void terminateDataPathRequest(in char cmdId, in int ndpInstanceId);
/**
+ * Start the suspension of a discovery service.
+ * Asynchronous response is with |IWifiNanIfaceEventCallback.notifySuspendResponse|.
+ *
+ * @param cmdId Command Id to use for this invocation.
+ * @param sessionId ID of the publish/subscribe discovery session to be suspended.
+ * @throws ServiceSpecificException with one of the following values:
+ * |WifiStatusCode.ERROR_NOT_SUPPORTED|,
+ * |WifiStatusCode.ERROR_WIFI_IFACE_INVALID|,
+ * |WifiStatusCode.ERROR_UNKNOWN|
+ */
+ void suspendRequest(in char cmdId, in byte sessionId);
+
+ /**
+ * Stop the suspension of a discovery service.
+ * Asynchronous response is with |IWifiNanIfaceEventCallback.notifyResumeResponse|.
+ *
+ * @param cmdId Command Id to use for this invocation.
+ * @param sessionId ID of the publish/subscribe discovery session to be resumed.
+ * @throws ServiceSpecificException with one of the following values:
+ * |WifiStatusCode.ERROR_NOT_SUPPORTED|,
+ * |WifiStatusCode.ERROR_WIFI_IFACE_INVALID|,
+ * |WifiStatusCode.ERROR_UNKNOWN|
+ */
+ void resumeRequest(in char cmdId, in byte sessionId);
+
+ /**
* NAN transmit follow up message request.
* Asynchronous response is with |IWifiNanIfaceEventCallback.notifyTransmitFollowupResponse|.
*
diff --git a/wifi/aidl/android/hardware/wifi/IWifiNanIfaceEventCallback.aidl b/wifi/aidl/android/hardware/wifi/IWifiNanIfaceEventCallback.aidl
index 6b06def..3fd37a7 100644
--- a/wifi/aidl/android/hardware/wifi/IWifiNanIfaceEventCallback.aidl
+++ b/wifi/aidl/android/hardware/wifi/IWifiNanIfaceEventCallback.aidl
@@ -310,6 +310,32 @@
void notifyTerminateDataPathResponse(in char id, in NanStatus status);
/**
+ * Callback invoked in response to a suspension request
+ * |IWifiNanIface.suspendRequest|.
+ *
+ * @param cmdId Command Id corresponding to the original request.
+ * @param status NanStatus of the operation. Possible status codes are:
+ * |NanStatusCode.SUCCESS|
+ * |NanStatusCode.INVALID_SESSION_ID|
+ * |NanStatusCode.INVALID_STATE|
+ * |NanStatusCode.INTERNAL_FAILURE|
+ */
+ void notifySuspendResponse(in char id, in NanStatus status);
+
+ /**
+ * Callback invoked in response to a resume request
+ * |IWifiNanIface.resumeRequest|.
+ *
+ * @param cmdId Command Id corresponding to the original request.
+ * @param status NanStatus of the operation. Possible status codes are:
+ * |NanStatusCode.SUCCESS|
+ * |NanStatusCode.INVALID_SESSION_ID|
+ * |NanStatusCode.INVALID_STATE|
+ * |NanStatusCode.INTERNAL_FAILURE|
+ */
+ void notifyResumeResponse(in char id, in NanStatus status);
+
+ /**
* Callback invoked in response to a transmit followup request
* |IWifiNanIface.transmitFollowupRequest|.
*
diff --git a/wifi/aidl/android/hardware/wifi/NanStatusCode.aidl b/wifi/aidl/android/hardware/wifi/NanStatusCode.aidl
index efce867..d609797 100644
--- a/wifi/aidl/android/hardware/wifi/NanStatusCode.aidl
+++ b/wifi/aidl/android/hardware/wifi/NanStatusCode.aidl
@@ -78,5 +78,9 @@
/**
* If the bootstrapping id is invalid
*/
- INVALID_BOOTSTRAPPING_ID = 14
+ INVALID_BOOTSTRAPPING_ID = 14,
+ /**
+ * If the system is not in a valid state for the given request.
+ */
+ INVALID_STATE = 15
}