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

Commit 63831faf authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Flags: Sort hap flags" into main am: a0f0f303 am: 09e33455 

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



Change-Id: I2d8cc7461b3cedb8c14062fda094da4acaa33e4e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6b1506e7 09e33455

flags/hap.aconfig

+10 −11
Original line number Diff line number Diff line
@@ -2,18 +2,18 @@ package: "com.android.bluetooth.flags" 
container: "com.android.btservices"



flag {

    name: "enable_hap_by_default"

    name: "aics_api"

    is_exported: true

    namespace: "bluetooth"

    description: "On device that support HAP, enable it by default and disable ASHA"

    bug: "345826775"

    description: "Expose new API to control AICS data"

    bug: "372328699"

}



flag {

    name: "settings_can_control_hap_preset"

    is_exported: true

    name: "enable_hap_by_default"

    namespace: "bluetooth"

    description: "Allow user to control the preset of hearing aid devices"

    bug: "306236481"

    description: "On device that support HAP, enable it by default and disable ASHA"

    bug: "345826775"

}



flag {
@@ -26,11 +26,10 @@ flag { 
    }

}





flag {

    name: "aics_api"

    name: "settings_can_control_hap_preset"

    is_exported: true

    namespace: "bluetooth"

    description: "Expose new API to control AICS data"

    bug: "372328699"

    description: "Allow user to control the preset of hearing aid devices"

    bug: "306236481"

}