Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73d15359 authored by Zhengping Jiang's avatar Zhengping Jiang Committed by Automerger Merge Worker
Browse files

Merge "Add flag verify_handle_before_add_accept_list" into main am: 957e60cf 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3073821



Change-Id: I67221a3d4e89934c8c80f1c81b00edd86c2f4719
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 04b2d0ac 957e60cf

flags/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ aconfig_declarations { 
        "avrcp_controller.aconfig",

        "bta_dm.aconfig",

        "btif_dm.aconfig",

        "btm_ble.aconfig",

        "connectivity.aconfig",

        "device_iot_config.aconfig",

        "did.aconfig",

flags/BUILD.gn

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ aconfig("bluetooth_flags_c_lib") { 
    "avrcp_controller.aconfig",

    "bta_dm.aconfig",

    "btif_dm.aconfig",

    "btm_ble.aconfig",

    "connectivity.aconfig",

    "device_iot_config.aconfig",

    "did.aconfig",

flags/btm_ble.aconfig

0 → 100644
+12 −0
Original line number Diff line number Diff line 
package: "com.android.bluetooth.flags"

container: "com.android.btservices"



flag {

    name: "verify_handle_before_add_accept_list"

    namespace: "bluetooth"

    description: "Verify there is no valid handle before adding address to the accept list"

    bug: "338112215"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}