Make TWT wake interval type as long
As the TWT Wake Interval Mantissa is a 2-byte field and TWT Wake
Interval Exponent is a 5-bit field, Maximum TWT Wake Interval =
65,535 x [2^31] microseconds. So make TWT wake inteval field type as
long to avoid overflow.
Bug: 296108122
Test: m
Change-Id: Id77cd094ae0601839de7f01994072d50ec39cd56
diff --git a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/TwtCapabilities.aidl b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/TwtCapabilities.aidl
index d8e73fb..d6ed62e 100644
--- a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/TwtCapabilities.aidl
+++ b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/TwtCapabilities.aidl
@@ -40,6 +40,6 @@
boolean isFlexibleTwtScheduleSupported;
int minWakeDurationMicros;
int maxWakeDurationMicros;
- int minWakeIntervalMicros;
- int maxWakeIntervalMicros;
+ long minWakeIntervalMicros;
+ long maxWakeIntervalMicros;
}
diff --git a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/TwtRequest.aidl b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/TwtRequest.aidl
index 3051b94..06c7ae2 100644
--- a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/TwtRequest.aidl
+++ b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/TwtRequest.aidl
@@ -37,6 +37,6 @@
int mloLinkId;
int minWakeDurationMicros;
int maxWakeDurationMicros;
- int minWakeIntervalMicros;
- int maxWakeIntervalMicros;
+ long minWakeIntervalMicros;
+ long maxWakeIntervalMicros;
}
diff --git a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/TwtSession.aidl b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/TwtSession.aidl
index 92c2533..4e5ca44 100644
--- a/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/TwtSession.aidl
+++ b/wifi/aidl/aidl_api/android.hardware.wifi/current/android/hardware/wifi/TwtSession.aidl
@@ -37,7 +37,7 @@
int sessionId;
int mloLinkId;
int wakeDurationMicros;
- int wakeIntervalMicros;
+ long wakeIntervalMicros;
android.hardware.wifi.TwtSession.TwtNegotiationType negotiationType;
boolean isTriggerEnabled;
boolean isAnnounced;
diff --git a/wifi/aidl/android/hardware/wifi/TwtCapabilities.aidl b/wifi/aidl/android/hardware/wifi/TwtCapabilities.aidl
index 9007d0e..4012c3e 100644
--- a/wifi/aidl/android/hardware/wifi/TwtCapabilities.aidl
+++ b/wifi/aidl/android/hardware/wifi/TwtCapabilities.aidl
@@ -48,9 +48,9 @@
/**
* Minimum TWT wake interval in microseconds.
*/
- int minWakeIntervalMicros;
+ long minWakeIntervalMicros;
/**
* Maximum TWT wake interval in microseconds.
*/
- int maxWakeIntervalMicros;
+ long maxWakeIntervalMicros;
}
diff --git a/wifi/aidl/android/hardware/wifi/TwtRequest.aidl b/wifi/aidl/android/hardware/wifi/TwtRequest.aidl
index 5191713..b063da3 100644
--- a/wifi/aidl/android/hardware/wifi/TwtRequest.aidl
+++ b/wifi/aidl/android/hardware/wifi/TwtRequest.aidl
@@ -36,9 +36,9 @@
/**
* Minimum TWT wake interval in microseconds.
*/
- int minWakeIntervalMicros;
+ long minWakeIntervalMicros;
/**
* Maximum TWT wake interval in microseconds.
*/
- int maxWakeIntervalMicros;
+ long maxWakeIntervalMicros;
}
diff --git a/wifi/aidl/android/hardware/wifi/TwtSession.aidl b/wifi/aidl/android/hardware/wifi/TwtSession.aidl
index 5a7ddb1..6b780f8 100644
--- a/wifi/aidl/android/hardware/wifi/TwtSession.aidl
+++ b/wifi/aidl/android/hardware/wifi/TwtSession.aidl
@@ -46,7 +46,7 @@
/**
* Time interval in microseconds between two successive TWT service periods.
*/
- int wakeIntervalMicros;
+ long wakeIntervalMicros;
/**
* TWT negotiation type.