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

Commit 88b803cc authored by Himanshu Rawat's avatar Himanshu Rawat Committed by Automerger Merge Worker
Browse files

Merge "Flag to prevent sending duplicate service UUID intent" into main am: bf5a39fb 

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



Change-Id: I0ae7d35cca9d11d06209c6be276ed658b719e251
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e5fb4c70 bf5a39fb

flags/Android.bp

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

        "sco.aconfig",

        "sdp.aconfig",

        "sdp.aconfig",

        "security.aconfig",

        "security.aconfig",

        "service_discovery.aconfig",

        "sockets.aconfig",

        "sockets.aconfig",

        "system_service.aconfig",

        "system_service.aconfig",

        "vcp.aconfig",

        "vcp.aconfig",

flags/BUILD.gn

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

    "sco.aconfig",

    "sdp.aconfig",

    "sdp.aconfig",

    "security.aconfig",

    "security.aconfig",

    "service_discovery.aconfig",

    "sockets.aconfig",

    "sockets.aconfig",

    "system_service.aconfig",

    "system_service.aconfig",

    "vcp.aconfig",

    "vcp.aconfig",

flags/service_discovery.aconfig

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

container: "com.android.btservices"



flag {

    name: "prevent_duplicate_uuid_intent"

    namespace: "bluetooth"

    description: "Avoid sending duplicate service UUID intent when fetchUuidsWithSdp() API is called"

    bug: "361182196"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}