Merge changes I0c7a5557,I4c835885,I5b6b1db3,I775b8576,Ie128b26f into main

* changes:
  Add coverage for secure ranging in NetworkDetail
  Add coverage for secure ranging in ScanResult
  Add coverage for Rsnxe class
  Fix RangingResult parcelling
  Add unit test for SecureRangingConfig

2 files changed, 15 insertions, 2 deletions

diff --git a/framework/java/android/net/wifi/rtt/RangingResult.java b/framework/java/android/net/wifi/rtt/RangingResult.java
index 604c879daa..166a13b1d9 100644
--- a/framework/java/android/net/wifi/rtt/RangingResult.java
+++ b/framework/java/android/net/wifi/rtt/RangingResult.java
@@ -1168,6 +1168,12 @@ public final class RangingResult implements Parcelable {
         if (SdkLevel.isAtLeastV()) {
             dest.writeList(mVendorData);
         }
+        dest.writeBoolean(mIsRangingAuthenticated);
+        dest.writeBoolean(mIsRangingFrameProtected);
+        dest.writeBoolean(mIsSecureHeLtfEnabled);
+        dest.writeLong(mPasnComebackAfterMillis);
+        dest.writeByteArray(mPasnComebackCookie);
+        dest.writeInt(mSecureHeLtfProtocolVersion);
     }
 
     public static final @android.annotation.NonNull Creator<RangingResult> CREATOR =
@@ -1208,6 +1214,12 @@ public final class RangingResult implements Parcelable {
                     if (SdkLevel.isAtLeastV()) {
                         builder.setVendorData(ParcelUtil.readOuiKeyedDataList(in));
                     }
+                    builder.setRangingAuthenticated(in.readBoolean())
+                            .setRangingFrameProtected(in.readBoolean())
+                            .setSecureHeLtfEnabled(in.readBoolean())
+                            .setPasnComebackAfterMillis(in.readLong())
+                            .setPasnComebackCookie(in.createByteArray())
+                            .setSecureHeLtfProtocolVersion(in.readInt());
                     return builder.build();
                 }
             };
diff --git a/framework/java/android/net/wifi/rtt/ResponderConfig.java b/framework/java/android/net/wifi/rtt/ResponderConfig.java
index 5b4f2da08a..ffa98499ed 100644
--- a/framework/java/android/net/wifi/rtt/ResponderConfig.java
+++ b/framework/java/android/net/wifi/rtt/ResponderConfig.java
@@ -514,13 +514,14 @@ public final class ResponderConfig implements Parcelable {
         if (scanResult.getWifiSsid() != null) {
             pasnConfigBuilder.setWifiSsid(scanResult.getWifiSsid());
         }
+        // If the responder is capable of PASN, always enable frame protection for secure ranging
+        // irrespective of responder mandates or not.
         return new SecureRangingConfig.Builder(pasnConfigBuilder.build())
                 .setSecureHeLtfEnabled(scanResult.isSecureHeLtfSupported())
-                .setRangingFrameProtectionEnabled(scanResult.isRangingFrameProtectionRequired())
+                .setRangingFrameProtectionEnabled(true)
                 .build();
     }
 
-
     /**
      * Creates a Responder configuration from a MAC address corresponding to a Wi-Fi Aware
      * Responder. The Responder parameters are set to defaults.