From f58c8e09d31e03c9cd2354e3e55f3886fd280d7a Mon Sep 17 00:00:00 2001
From: maheshkkv <maheshkkv@google.com>
Date: Thu, 14 Dec 2023 16:41:28 -0800
Subject: [PATCH] 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
---
 .../current/android/hardware/wifi/TwtCapabilities.aidl        | 4 ++--
 .../current/android/hardware/wifi/TwtRequest.aidl             | 4 ++--
 .../current/android/hardware/wifi/TwtSession.aidl             | 2 +-
 wifi/aidl/android/hardware/wifi/TwtCapabilities.aidl          | 4 ++--
 wifi/aidl/android/hardware/wifi/TwtRequest.aidl               | 4 ++--
 wifi/aidl/android/hardware/wifi/TwtSession.aidl               | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

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 d8e73fb4b7..d6ed62e943 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 @@ parcelable TwtCapabilities {
   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 3051b943a3..06c7ae2433 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 @@ parcelable TwtRequest {
   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 92c2533e2c..4e5ca44f17 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 @@ parcelable TwtSession {
   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 9007d0e5be..4012c3ed73 100644
--- a/wifi/aidl/android/hardware/wifi/TwtCapabilities.aidl
+++ b/wifi/aidl/android/hardware/wifi/TwtCapabilities.aidl
@@ -48,9 +48,9 @@ parcelable TwtCapabilities {
     /**
      * 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 5191713f57..b063da3911 100644
--- a/wifi/aidl/android/hardware/wifi/TwtRequest.aidl
+++ b/wifi/aidl/android/hardware/wifi/TwtRequest.aidl
@@ -36,9 +36,9 @@ parcelable TwtRequest {
     /**
      * 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 5a7ddb1a0b..6b780f8343 100644
--- a/wifi/aidl/android/hardware/wifi/TwtSession.aidl
+++ b/wifi/aidl/android/hardware/wifi/TwtSession.aidl
@@ -46,7 +46,7 @@ parcelable TwtSession {
     /**
      * Time interval in microseconds between two successive TWT service periods.
      */
-    int wakeIntervalMicros;
+    long wakeIntervalMicros;
 
     /**
      * TWT negotiation type.