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

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

Merge changes Ib68abd6b,I79c24a5b,Ie8928e27 into main am: a5ab7bec am: afb5ab2f 

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



Change-Id: Icabc8c2c58ece4123f81b40bd6fc66be3f2828b1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 75137f38 afb5ab2f

flags/Android.bp

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

        "framework.aconfig",

        "gap.aconfig",

        "hal.aconfig",

        "hap.aconfig",

        "hfp.aconfig",

        "hid.aconfig",

flags/BUILD.gn

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

    "framework.aconfig",

    "gap.aconfig",

    "hal.aconfig",

    "hap.aconfig",

    "hfp.aconfig",

    "hid.aconfig",

flags/hal.aconfig

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

container: "com.android.btservices"



flag {

    name: "audio_port_binder_inherit_rt"

    namespace: "bluetooth"

    description: "Allow audio port AIDL thread to inherit thread priority from its caller"

    bug: "335049159"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}

flags/system_service.aconfig

+19 −19
Original line number Diff line number Diff line 
package: "com.android.bluetooth.flags"

container: "com.android.btservices"



flag {

    name: "airplane_mode_x_ble_on"

    namespace: "bluetooth"

    description: "Airplane mode is not properly listen to when reaching BLE mode"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

    bug: "338079154"

}



flag {

    name: "auto_on_feature"

    is_exported: true
@@ -10,10 +20,13 @@ flag { 
}



flag {

    name: "system_server_messenger"

    name: "explicit_kill_from_system_server"

    namespace: "bluetooth"

    description: "Replace binder call to the system server with a Messenger to enforce thread safety"

    bug: "321804999"

    description: "Explicit kill and wait of Bluetooth AdapterService when turning Bluetooth OFF"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

    bug: "339548431"

}



flag {
@@ -24,21 +37,8 @@ flag { 
}



flag {

    name: "airplane_mode_x_ble_on"

    namespace: "bluetooth"

    description: "Airplane mode is not properly listen to when reaching BLE mode"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

    bug: "338079154"

}



flag {

    name: "audio_port_binder_inherit_rt"

    name: "system_server_messenger"

    namespace: "bluetooth"

    description: "Allow audio port AIDL thread to inherit thread priority from its caller"

    bug: "335049159"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

    description: "Replace binder call to the system server with a Messenger to enforce thread safety"

    bug: "321804999"

}