Merge "Address API review comments for NAN periodic ranging" into main

3 files changed, 43 insertions, 18 deletions

diff --git a/framework/api/system-current.txt b/framework/api/system-current.txt
index e5d5e8feb0..937fbe95bc 100644
--- a/framework/api/system-current.txt
+++ b/framework/api/system-current.txt
@@ -1528,7 +1528,7 @@ package android.net.wifi.aware {
   }
 
   public final class Characteristics implements android.os.Parcelable {
-    method @FlaggedApi("com.android.ranging.flags.ranging_rtt_enabled") public int getMaxSupportedRangingPktBandwidth();
+    method @FlaggedApi("com.android.ranging.flags.ranging_rtt_enabled") public int getMaxSupportedRangingPacketBandwidth();
     method @FlaggedApi("com.android.ranging.flags.ranging_rtt_enabled") public int getMaxSupportedRxChains();
     method @FlaggedApi("com.android.ranging.flags.ranging_rtt_enabled") public boolean isPeriodicRangingSupported();
     field @FlaggedApi("com.android.ranging.flags.ranging_rtt_enabled") public static final int SUPPORTED_RX_CHAINS_1 = 1; // 0x1
diff --git a/framework/java/android/net/wifi/aware/Characteristics.java b/framework/java/android/net/wifi/aware/Characteristics.java
index fa8c4ed6fc..600739029d 100644
--- a/framework/java/android/net/wifi/aware/Characteristics.java
+++ b/framework/java/android/net/wifi/aware/Characteristics.java
@@ -270,7 +270,7 @@ public final class Characteristics implements Parcelable {
      */
     @FlaggedApi(FLAG_RANGING_RTT_ENABLED)
     @SystemApi
-    public @WifiAnnotations.ChannelWidth int getMaxSupportedRangingPktBandwidth() {
+    public @WifiAnnotations.ChannelWidth int getMaxSupportedRangingPacketBandwidth() {
         return mCharacteristics.getInt(KEY_MAX_SUPPORTED_RANGING_PKT_BANDWIDTH);
     }
 
diff --git a/framework/java/android/net/wifi/aware/SubscribeConfig.java b/framework/java/android/net/wifi/aware/SubscribeConfig.java
index e9d680623b..13f290ebe2 100644
--- a/framework/java/android/net/wifi/aware/SubscribeConfig.java
+++ b/framework/java/android/net/wifi/aware/SubscribeConfig.java
@@ -100,50 +100,75 @@ public final class SubscribeConfig implements Parcelable {
     @Retention(RetentionPolicy.SOURCE)
     public @interface PeriodicRangingInterval {
     }
-    /* Ranging is not repeated */
-    /** @hide */
+
+    /**
+     * Ranging is not repeated
+     *
+     * @hide
+     */
     @FlaggedApi(FLAG_RANGING_RTT_ENABLED)
     @SystemApi
     public static final int PERIODIC_RANGING_INTERVAL_NONE = 0;
 
-    /* Ranging interval is 128TU [= (128 * 1024) / 1000 = 131.072 ms] */
-    /** @hide */
+    /**
+     * Ranging interval is 128TU [= (128 * 1024) / 1000 = 131.072 ms]
+     *
+     * @hide
+     */
     @FlaggedApi(FLAG_RANGING_RTT_ENABLED)
     @SystemApi
     public static final int PERIODIC_RANGING_INTERVAL_128TU = 128;
 
-    /* Ranging interval is 256TU [= (256 * 1024) / 1000 = 262.144 ms] */
-    /** @hide */
+    /**
+     * Ranging interval is 256TU [= (256 * 1024) / 1000 = 262.144 ms]
+     *
+     * @hide
+     */
     @FlaggedApi(FLAG_RANGING_RTT_ENABLED)
     @SystemApi
     public static final int PERIODIC_RANGING_INTERVAL_256TU = 256;
 
-    /* Ranging interval is 512TU [= (512 * 1024) / 1000 = 524.288 ms] */
-    /** @hide */
+    /**
+     * Ranging interval is 512TU [= (512 * 1024) / 1000 = 524.288 ms]
+     *
+     * @hide
+     */
     @FlaggedApi(FLAG_RANGING_RTT_ENABLED)
     @SystemApi
     public static final int PERIODIC_RANGING_INTERVAL_512TU = 512;
 
-    /* Ranging interval is 1024TU [= (1024 * 1024) / 1000 = 1048.576 ms] */
-    /** @hide */
+    /**
+     * Ranging interval is 1024TU [= (1024 * 1024) / 1000 = 1048.576 ms]
+     *
+     * @hide
+     */
     @FlaggedApi(FLAG_RANGING_RTT_ENABLED)
     @SystemApi
     public static final int PERIODIC_RANGING_INTERVAL_1024TU = 1024;
 
-    /* Ranging interval is 2048TU [= (2048 * 1024) / 1000 = 2097.152 ms] */
-    /** @hide */
+    /**
+     * Ranging interval is 2048TU [= (2048 * 1024) / 1000 = 2097.152 ms]
+     *
+     * @hide
+     */
     @FlaggedApi(FLAG_RANGING_RTT_ENABLED)
     @SystemApi
     public static final int PERIODIC_RANGING_INTERVAL_2048TU = 2048;
 
-    /* Ranging interval is 4096TU [= (4096 * 1024) / 1000 = 4194.304 ms] */
-    /** @hide */
+    /**
+     * Ranging interval is 4096TU [= (4096 * 1024) / 1000 = 4194.304 ms]
+     *
+     * @hide
+     */
     @FlaggedApi(FLAG_RANGING_RTT_ENABLED)
     @SystemApi
     public static final int PERIODIC_RANGING_INTERVAL_4096TU = 4096;
 
-    /* Ranging interval is 8192TU [= (8192 * 1024) / 1000 = 8388.608 ms] */
-    /** @hide */
+    /**
+     * Ranging interval is 8192TU [= (8192 * 1024) / 1000 = 8388.608 ms]
+     *
+     * @hide
+     */
     @FlaggedApi(FLAG_RANGING_RTT_ENABLED)
     @SystemApi
     public static final int PERIODIC_RANGING_INTERVAL_8192TU = 8192;