Merge cherrypicks of ['googleplex-android-review.googlesource.com/32701660', 'googleplex-android-review.googlesource.com/32806018'] into 25Q2-release.
Change-Id: Ib295be29cef95a69d750b18cf2bd08b89061e168
diff --git a/security/see/hwcrypto/aidl/vts/functional/Android.bp b/security/see/hwcrypto/aidl/vts/functional/Android.bp
index fc63878..fdf1dac 100644
--- a/security/see/hwcrypto/aidl/vts/functional/Android.bp
+++ b/security/see/hwcrypto/aidl/vts/functional/Android.bp
@@ -36,6 +36,9 @@
arm64: {
enabled: true,
},
+ arm: {
+ enabled: true,
+ },
},
}
diff --git a/wifi/aidl/android/hardware/wifi/NanCapabilities.aidl b/wifi/aidl/android/hardware/wifi/NanCapabilities.aidl
index f9f825f..1a0408b 100644
--- a/wifi/aidl/android/hardware/wifi/NanCapabilities.aidl
+++ b/wifi/aidl/android/hardware/wifi/NanCapabilities.aidl
@@ -93,8 +93,19 @@
* Flag to indicate if High Efficiency is supported.
*/
boolean supportsHe;
+
/**
- * Flag to indicate if NAN pairing is supported.
+ * Flag to indicate if NAN pairing and all associated Aware R4 security features are supported.
+ *
+ * This flag is set to true only if all of the following are supported:
+ * - NAN Pairing (as in Wi-Fi Aware Specification Version 4.0 section 7.6)
+ * - NDP unicast data frame encryption (as in Wi-Fi Aware Specification Version 4.0 section
+ * 7.3.1)
+ * - Group addressed data frame encryption (as in Wi-Fi Aware Specification Version 4.0
+ * section 7.3.3)
+ * - Management frame protection (as in Wi-Fi Aware Specification Version 4.0 section 7.3.2
+ * for both unicast and multicast frames)
+ * - Beacon integrity protection (as in Wi-Fi Aware Specification Version 4.0 section 7.3.4)
*/
boolean supportsPairing;
/**