diff options
| author | 2025-03-14 18:46:15 -0700 | |
|---|---|---|
| committer | 2025-03-14 18:46:15 -0700 | |
| commit | a3b21c326cb5efb483bd32d07b617dc988719cf8 (patch) | |
| tree | 8fcdc295b6e66169bc467108437b768eb7bd00d7 /framework/java | |
| parent | 5d83e0c385fc4989895a2d4b2deb1bad85b56ff3 (diff) | |
| parent | 452e0ea4c4d5331907fecbaf97299f45ce7c32ec (diff) | |
Merge "Fix the cipher usage for PASN" into main
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 898e521aa7..550fa6f5ea 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); } |