diff options
| author | 2024-09-19 00:39:24 +0000 | |
|---|---|---|
| committer | 2024-09-19 00:39:24 +0000 | |
| commit | 003d311e5696b2a567e86b766e6f16525f084cd4 (patch) | |
| tree | e723f5099a3444758046c2637cb40b37d511e439 /flags | |
| parent | 3d80596134b948245f1e9aff3f82c4fc06f2a597 (diff) | |
| parent | 4e2084ebadc95cc6c683e22bcdf39620c3f7ef4d (diff) | |
Merge changes I6303ecbc,Ie0dddd9a into main am: 547dc3ae98 am: 4e2084ebad
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3257657
Change-Id: Iaa8dd132e8d6db8b0e41619649caed17c63d1496
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'flags')
| -rw-r--r-- | flags/framework.aconfig | 7 | ||||
| -rw-r--r-- | flags/security.aconfig | 7 |
2 files changed, 0 insertions, 14 deletions
diff --git a/flags/framework.aconfig b/flags/framework.aconfig index 89b398a4fa..3a1ae1b26d 100644 --- a/flags/framework.aconfig +++ b/flags/framework.aconfig @@ -36,13 +36,6 @@ flag { } flag { - name: "keep_stopped_media_browser_service" - namespace: "bluetooth" - description: "Do not start stopped media browser services" - bug: "314855224" -} - -flag { name: "identity_address_null_if_not_known" namespace: "bluetooth" description: "Return null for identity address if identity address is not known" diff --git a/flags/security.aconfig b/flags/security.aconfig index 7bea36723d..2bb69eac95 100644 --- a/flags/security.aconfig +++ b/flags/security.aconfig @@ -16,13 +16,6 @@ flag { } flag { - name: "fix_le_pairing_passkey_entry_bypass" - namespace: "bluetooth" - description: "Fix the passkey entry bypassing bug in SMP" - bug: "321300737" -} - -flag { name: "bta_av_setconfig_rej_type_confusion" namespace: "bluetooth" description: "Use stream control block for bta_av_setconfig_rej instead of a possibly incorrect union type" |