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

Commit cd1f70ff authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge changes I62ec2d66,I9388582d into main am: e82e8f94 am: 78c95e5f 

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



Change-Id: I418e7988ee682b372bdabaf85b818040fab2b1bd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d2d5b80d 78c95e5f

flags/bta_dm.aconfig

+0 −7
Original line number Diff line number Diff line
@@ -15,13 +15,6 @@ flag { 
    bug: "323083457"

}



flag {

    name: "continue_service_discovery_when_cancel_device_discovery"

    namespace: "bluetooth"

    description: "Continue service discovery when API cancel device discovery called"

    bug: "329642681"

}



flag {

    name: "bta_dm_discover_both"

    namespace: "bluetooth"

flags/sdp.aconfig

+0 −7
Original line number Diff line number Diff line
@@ -7,10 +7,3 @@ flag { 
    description: "Check for NIL SDP property length"

    bug: "329171845"

}
 


flag {

    name: "stack_sdp_disconnect_when_cancel_in_pending_state"

    namespace: "bluetooth"

    description: "Send disconnect when cancel in pending state"

    bug: "329918955"

}