summaryrefslogtreecommitdiff
path: root/flags/security.aconfig
diff options
context:
space:
mode:
author Xin Li <delphij@google.com> 2024-05-20 22:41:47 -0700
committer Xin Li <delphij@google.com> 2024-05-20 22:48:06 -0700
commit18f2ffe04f31f1adb1be471c44d58533b942db9f (patch)
tree382c83c845f33495e7935ab5fa41ea7122e8b9fa /flags/security.aconfig
parentf81cb6d14761266ec92e4e89e4f98ba4a7081a3c (diff)
parent6330ce35209b0cb8e7b19178fc22258aff5a42e0 (diff)
Merge Android 24Q2 Release (ab/11526283) to aosp-main-future
Bug: 337098550 Merged-In: Ic6401ddfd1ea18d6f846bb8719ca798d2ef9bbf4 Change-Id: I1d6ac3427fe557c300fcbaeb8c79912139341205
Diffstat (limited to 'flags/security.aconfig')
-rw-r--r--flags/security.aconfig20
1 files changed, 20 insertions, 0 deletions
diff --git a/flags/security.aconfig b/flags/security.aconfig
index 1e5cc61016..c90cbe4ca2 100644
--- a/flags/security.aconfig
+++ b/flags/security.aconfig
@@ -15,6 +15,12 @@ flag {
bug: "319530790"
}
+flag {
+ name: "bluffs_mitigation"
+ namespace: "bluetooth"
+ description: "Cache security values to mitigate BLUFFS"
+ bug: "314331379"
+}
flag {
name: "fix_pairing_failure_reason_from_remote"
@@ -22,3 +28,17 @@ flag {
description: "Correct the pairing failure reason reported from remote"
bug: "320745565"
}
+
+flag {
+ name: "fix_le_oob_pairing_bypass"
+ namespace: "bluetooth"
+ description: "Fix oob bypassing bug in SMP"
+ bug: "321271585"
+}
+
+flag {
+ name: "fix_le_pairing_passkey_entry_bypass"
+ namespace: "bluetooth"
+ description: "Fix the passkey entry bypassing bug in SMP"
+ bug: "321300737"
+}