diff options
Diffstat (limited to 'flags')
| -rw-r--r-- | flags/hci.aconfig | 7 | ||||
| -rw-r--r-- | flags/l2cap.aconfig | 10 | ||||
| -rw-r--r-- | flags/opp.aconfig | 17 | ||||
| -rw-r--r-- | flags/pairing.aconfig | 30 | ||||
| -rw-r--r-- | flags/security.aconfig | 17 | ||||
| -rw-r--r-- | flags/system_service.aconfig | 10 |
6 files changed, 47 insertions, 44 deletions
diff --git a/flags/hci.aconfig b/flags/hci.aconfig index cdd5ca3ab6..6f6b1e70df 100644 --- a/flags/hci.aconfig +++ b/flags/hci.aconfig @@ -2,13 +2,6 @@ package: "com.android.bluetooth.flags" container: "com.android.bt" flag { - name: "encryption_change_v2" - namespace: "bluetooth" - description: "Enable encryption change V2 event" - bug: "366018699" -} - -flag { name: "dont_send_hci_disconnect_repeatedly" namespace: "bluetooth" description: "Prevent BT from sending repeated HCI disconnect command" diff --git a/flags/l2cap.aconfig b/flags/l2cap.aconfig index fec2edd6d5..f82b596674 100644 --- a/flags/l2cap.aconfig +++ b/flags/l2cap.aconfig @@ -9,16 +9,6 @@ flag { } flag { - name: "l2cap_le_do_not_adjust_min_interval" - namespace: "bluetooth" - description: "Do not adjust min_interval in connection update request" - bug: "346960036" - metadata { - purpose: PURPOSE_BUGFIX - } -} - -flag { name: "l2cap_fcs_option_fix" namespace: "bluetooth" description: "Use fcs_option for non BASIC mode " diff --git a/flags/opp.aconfig b/flags/opp.aconfig index 73604961fe..6d1a13bf21 100644 --- a/flags/opp.aconfig +++ b/flags/opp.aconfig @@ -41,3 +41,20 @@ flag { } } +flag { + name: "opp_device_picker_extra_intent_apis" + is_exported: true + namespace: "bluetooth" + description: "New API to get the original intent in Bluetooth Device Picker" + bug: "395796600" +} + +flag { + name: "send_opp_device_picker_extra_intent" + namespace: "bluetooth" + description: "Send the original intent when opening Bluetooth device picker" + bug: "397852103" + metadata { + purpose: PURPOSE_BUGFIX + } +} diff --git a/flags/pairing.aconfig b/flags/pairing.aconfig index bc57bafe9e..f30410db17 100644 --- a/flags/pairing.aconfig +++ b/flags/pairing.aconfig @@ -102,16 +102,6 @@ flag { } flag { - name: "smp_state_machine_stuck_after_disconnection_fix" - namespace: "bluetooth" - description: "Fix state machine stuck after pairing device disconnection" - bug: "376306092" - metadata { - purpose: PURPOSE_BUGFIX - } -} - -flag { name: "prevent_service_connections_on_remove_bond" namespace: "bluetooth" description: "Disable service connections on remove bond" @@ -260,3 +250,23 @@ flag { purpose: PURPOSE_BUGFIX } } + +flag { + name: "le_peripheral_enc_failure" + namespace: "bluetooth" + description: "Don't remove bond on LE encryption failure in peripheral role with bonded device, instead just disconnect the link" + bug: "403313352" + metadata { + purpose: PURPOSE_BUGFIX + } +} + +flag { + name: "immediate_encryption_after_pairing" + namespace: "bluetooth" + description: "Encrypt BR/EDR link immediately after pairing" + bug: "402510244" + metadata { + purpose: PURPOSE_BUGFIX + } +} diff --git a/flags/security.aconfig b/flags/security.aconfig index c83dc02b24..8d5a8c1f31 100644 --- a/flags/security.aconfig +++ b/flags/security.aconfig @@ -2,13 +2,6 @@ package: "com.android.bluetooth.flags" container: "com.android.bt" flag { - name: "key_missing_classic_device" - namespace: "bluetooth" - description: "Key missing broadcast for Classic devices" - bug: "333634398" -} - -flag { name: "key_missing_ble_peripheral" namespace: "bluetooth" description: "Key missing broadcast for LE devices in peripheral role" @@ -66,16 +59,6 @@ flag { } flag { - name: "sec_disconnect_on_le_key_missing" - namespace: "bluetooth" - description: "Disconnect LE link when keys are missing during encryption" - bug: "376680866" - metadata { - purpose: PURPOSE_BUGFIX - } -} - -flag { name: "guard_bonded_device_properties" namespace: "bluetooth" description: "Don't update device properties for bonded devices from the device discovery results" diff --git a/flags/system_service.aconfig b/flags/system_service.aconfig index ea40eb33de..c1cf4f6bd8 100644 --- a/flags/system_service.aconfig +++ b/flags/system_service.aconfig @@ -2,6 +2,16 @@ package: "com.android.bluetooth.flags" container: "com.android.bt" flag { + name: "enable_ble_while_disabling_airplane" + namespace: "bluetooth" + description: "Fix a race between enabling and handling airplane event" + bug: "402563502" + metadata { + purpose: PURPOSE_BUGFIX + } +} + +flag { name: "kill_instead_of_exit" namespace: "bluetooth" description: "There is no value in pretending we are exiting properly. This is a kill and we should express it this way when finishing the process" |