diff options
| author | 2025-03-03 22:27:16 -0800 | |
|---|---|---|
| committer | 2025-03-14 16:11:56 -0700 | |
| commit | 452e0ea4c4d5331907fecbaf97299f45ce7c32ec (patch) | |
| tree | 62c958624ee0de1ccad96a17e1b80729710cd66b /framework/java | |
| parent | 0727149d1dc2a400c8b2a29fe0ce7c1a08e36e0e (diff) | |
Fix the cipher usage for PASN
Add support for GCMP_128 and CCMP_256. Also rename CCMP_128 to
CCMP and GCMP_128 to GCMP which aligns with wpa_supplicant.
Bug: 397619419
Test: atest FrameworksWifiTests
Flag: EXEMPT bug fix
Change-Id: I1ca01bbc4716708ac9cb749d47af1bdbfa17c724
Diffstat (limited to 'framework/java')
| -rw-r--r-- | framework/java/android/net/wifi/ScanResult.java | 6 | ||||
| -rw-r--r-- | framework/java/android/net/wifi/rtt/PasnConfig.java | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/framework/java/android/net/wifi/ScanResult.java b/framework/java/android/net/wifi/ScanResult.java index 6954590ae9..e4c91c4c75 100644 --- a/framework/java/android/net/wifi/ScanResult.java +++ b/framework/java/android/net/wifi/ScanResult.java @@ -442,6 +442,12 @@ public final class ScanResult implements Parcelable { */ @SystemApi public static final int CIPHER_BIP_CMAC_256 = 9; + /** + * @hide + * Cipher suite: CCMP_256 + */ + public static final int CIPHER_CCMP_256 = 10; + /** * The detected signal level in dBm, also known as the RSSI. diff --git a/framework/java/android/net/wifi/rtt/PasnConfig.java b/framework/java/android/net/wifi/rtt/PasnConfig.java index d420154cba..f1feb5bd29 100644 --- a/framework/java/android/net/wifi/rtt/PasnConfig.java +++ b/framework/java/android/net/wifi/rtt/PasnConfig.java @@ -176,7 +176,7 @@ public final class PasnConfig implements Parcelable { sStringToCipher.put("None", CIPHER_NONE); sStringToCipher.put("-CCMP]", CIPHER_CCMP_128); sStringToCipher.put("-CCMP-256]", CIPHER_CCMP_256); - sStringToCipher.put("-GCMP-128]", CIPHER_GCMP_128); + sStringToCipher.put("-GCMP]", CIPHER_GCMP_128); sStringToCipher.put("-GCMP-256]", CIPHER_GCMP_256); } |