From 14ba754f98634ab7ce42e020bf1b6e8736fd32c0 Mon Sep 17 00:00:00 2001 From: William Escande Date: Wed, 18 Dec 2024 19:05:16 -0800 Subject: [bt] Add the Google module in pixel image Flag: EXEMPT adding Google module to build is not flagged Test: presubmit Test: m then flash device then check Bluetooth version & functionality Ignore-AOSP-First: We must change the apex configuration for pixel at the same time to prevent breaking tip-of-tree Bug: 383863941 Change-Id: If3ec0ce5bd6243721680510e2c7078ad61c2f0a3 --- flags/Android.bp | 2 +- flags/a2dp.aconfig | 2 +- flags/active_device_manager.aconfig | 2 +- flags/adapter.aconfig | 2 +- flags/avrcp.aconfig | 2 +- flags/avrcp_controller.aconfig | 2 +- flags/bta_dm.aconfig | 2 +- flags/btif_dm.aconfig | 2 +- flags/btm_ble.aconfig | 2 +- flags/connectivity.aconfig | 2 +- flags/device_iot_config.aconfig | 2 +- flags/dis.aconfig | 2 +- flags/framework.aconfig | 2 +- flags/gap.aconfig | 2 +- flags/gatt.aconfig | 2 +- flags/hal.aconfig | 2 +- flags/hap.aconfig | 2 +- flags/hci.aconfig | 2 +- flags/hfp.aconfig | 2 +- flags/hfpclient.aconfig | 2 +- flags/hid.aconfig | 2 +- flags/l2cap.aconfig | 2 +- flags/le_advertising.aconfig | 2 +- flags/leaudio.aconfig | 2 +- flags/mapclient.aconfig | 2 +- flags/mcp.aconfig | 2 +- flags/metric.aconfig | 2 +- flags/opp.aconfig | 2 +- flags/pairing.aconfig | 2 +- flags/pbapclient.aconfig | 2 +- flags/ranging.aconfig | 2 +- flags/rfcomm.aconfig | 2 +- flags/rnr.aconfig | 2 +- flags/sco.aconfig | 2 +- flags/sdp.aconfig | 2 +- flags/security.aconfig | 2 +- flags/service_discovery.aconfig | 2 +- flags/sockets.aconfig | 2 +- flags/system_service.aconfig | 2 +- flags/vcp.aconfig | 2 +- flags/vsc.aconfig | 2 +- 41 files changed, 41 insertions(+), 41 deletions(-) (limited to 'flags') diff --git a/flags/Android.bp b/flags/Android.bp index f43322d4ed..3695db34ad 100644 --- a/flags/Android.bp +++ b/flags/Android.bp @@ -6,7 +6,7 @@ package { aconfig_declarations { name: "bluetooth_aconfig_flags", package: "com.android.bluetooth.flags", - container: "com.android.btservices", + container: "com.android.bt", visibility: ["//packages/modules/Bluetooth/framework"], // LINT.IfChange srcs: [ diff --git a/flags/a2dp.aconfig b/flags/a2dp.aconfig index e6275bf010..06d46a7f76 100644 --- a/flags/a2dp.aconfig +++ b/flags/a2dp.aconfig @@ -1,5 +1,5 @@ package: "com.android.bluetooth.flags" -container: "com.android.btservices" +container: "com.android.bt" flag { name: "bta_av_use_peer_codec" diff --git a/flags/active_device_manager.aconfig b/flags/active_device_manager.aconfig index fefcdd1d87..61637d83a2 100644 --- a/flags/active_device_manager.aconfig +++ b/flags/active_device_manager.aconfig @@ -1,5 +1,5 @@ package: "com.android.bluetooth.flags" -container: "com.android.btservices" +container: "com.android.bt" flag { name: "adm_fallback_when_wired_audio_disconnected" diff --git a/flags/adapter.aconfig b/flags/adapter.aconfig index f355113fe0..f6bf65e1f6 100644 --- a/flags/adapter.aconfig +++ b/flags/adapter.aconfig @@ -1,5 +1,5 @@ package: "com.android.bluetooth.flags" -container: "com.android.btservices" +container: "com.android.bt" flag { name: "adapter_properties_looper" diff --git a/flags/avrcp.aconfig b/flags/avrcp.aconfig index 5e806efb11..7a30583c07 100644 --- a/flags/avrcp.aconfig +++ b/flags/avrcp.aconfig @@ -1,5 +1,5 @@ package: "com.android.bluetooth.flags" -container: "com.android.btservices" +container: "com.android.bt" flag { name: "abs_volume_sdp_conflict" diff --git a/flags/avrcp_controller.aconfig b/flags/avrcp_controller.aconfig index 4374eef8fa..be732ee1ad 100644 --- a/flags/avrcp_controller.aconfig +++ b/flags/avrcp_controller.aconfig @@ -1,5 +1,5 @@ package: "com.android.bluetooth.flags" -container: "com.android.btservices" +container: "com.android.bt" flag { name: "uncache_player_when_browsed_player_changes" diff --git a/flags/bta_dm.aconfig b/flags/bta_dm.aconfig index e0ed3358b6..66600cbc0d 100644 --- a/flags/bta_dm.aconfig +++ b/flags/bta_dm.aconfig @@ -1,5 +1,5 @@ package: "com.android.bluetooth.flags" -container: "com.android.btservices" +container: "com.android.bt" flag { name: "bta_dm_defer_device_discovery_state_change_until_rnr_complete" diff --git a/flags/btif_dm.aconfig b/flags/btif_dm.aconfig index 2f16904b8f..b8802a9db1 100644 --- a/flags/btif_dm.aconfig +++ b/flags/btif_dm.aconfig @@ -1,5 +1,5 @@ package: "com.android.bluetooth.flags" -container: "com.android.btservices" +container: "com.android.bt" flag { name: "bond_transport_after_bond_cancel_fix" diff --git a/flags/btm_ble.aconfig b/flags/btm_ble.aconfig index 0922fd1aa0..2413c74be1 100644 --- a/flags/btm_ble.aconfig +++ b/flags/btm_ble.aconfig @@ -1,5 +1,5 @@ package: "com.android.bluetooth.flags" -container: "com.android.btservices" +container: "com.android.bt" flag { name: "floss_separate_host_privacy_and_llprivacy" diff --git a/flags/connectivity.aconfig b/flags/connectivity.aconfig index 80efed1aa2..10c9f417e2 100644 --- a/flags/connectivity.aconfig +++ b/flags/connectivity.aconfig @@ -1,5 +1,5 @@ package: "com.android.bluetooth.flags" -container: "com.android.btservices" +container: "com.android.bt" flag { name: "api_get_connection_state_using_identity_address" diff --git a/flags/device_iot_config.aconfig b/flags/device_iot_config.aconfig index 77ede517d4..a0fe92c9d3 100644 --- a/flags/device_iot_config.aconfig +++ b/flags/device_iot_config.aconfig @@ -1,5 +1,5 @@ package: "com.android.bluetooth.flags" -container: "com.android.btservices" +container: "com.android.bt" flag { name: "device_iot_config_logging" diff --git a/flags/dis.aconfig b/flags/dis.aconfig index f96d6c3b5f..ace19bca21 100644 --- a/flags/dis.aconfig +++ b/flags/dis.aconfig @@ -1,5 +1,5 @@ package: "com.android.bluetooth.flags" -container: "com.android.btservices" +container: "com.android.bt" flag { name: "queue_dis_requests" diff --git a/flags/framework.aconfig b/flags/framework.aconfig index 3a797af994..41cad78226 100644 --- a/flags/framework.aconfig +++ b/flags/framework.aconfig @@ -1,5 +1,5 @@ package: "com.android.bluetooth.flags" -container: "com.android.btservices" +container: "com.android.bt" flag { name: "support_metadata_device_types_apis" diff --git a/flags/gap.aconfig b/flags/gap.aconfig index 85df1c76d3..a6f04e43be 100644 --- a/flags/gap.aconfig +++ b/flags/gap.aconfig @@ -1,5 +1,5 @@ package: "com.android.bluetooth.flags" -container: "com.android.btservices" +container: "com.android.bt" flag { name: "encrypted_advertising_data" diff --git a/flags/gatt.aconfig b/flags/gatt.aconfig index 99b0305291..2de46293ac 100644 --- a/flags/gatt.aconfig +++ b/flags/gatt.aconfig @@ -1,5 +1,5 @@ package: "com.android.bluetooth.flags" -container: "com.android.btservices" +container: "com.android.bt" flag { name: "default_gatt_transport" diff --git a/flags/hal.aconfig b/flags/hal.aconfig index 286d1fceb4..e0da661dff 100644 --- a/flags/hal.aconfig +++ b/flags/hal.aconfig @@ -1,5 +1,5 @@ package: "com.android.bluetooth.flags" -container: "com.android.btservices" +container: "com.android.bt" flag { name: "audio_port_binder_inherit_rt" diff --git a/flags/hap.aconfig b/flags/hap.aconfig index 3ce320f88d..634000d0bd 100644 --- a/flags/hap.aconfig +++ b/flags/hap.aconfig @@ -1,5 +1,5 @@ package: "com.android.bluetooth.flags" -container: "com.android.btservices" +container: "com.android.bt" flag { name: "aics_api" diff --git a/flags/hci.aconfig b/flags/hci.aconfig index 79da26788b..cdd5ca3ab6 100644 --- a/flags/hci.aconfig +++ b/flags/hci.aconfig @@ -1,5 +1,5 @@ package: "com.android.bluetooth.flags" -container: "com.android.btservices" +container: "com.android.bt" flag { name: "encryption_change_v2" diff --git a/flags/hfp.aconfig b/flags/hfp.aconfig index 96985f2750..6e94769878 100644 --- a/flags/hfp.aconfig +++ b/flags/hfp.aconfig @@ -1,5 +1,5 @@ package: "com.android.bluetooth.flags" -container: "com.android.btservices" +container: "com.android.bt" flag { name: "auto_connect_on_multiple_hfp_when_no_a2dp_device" diff --git a/flags/hfpclient.aconfig b/flags/hfpclient.aconfig index ded90b3578..c134baac7e 100644 --- a/flags/hfpclient.aconfig +++ b/flags/hfpclient.aconfig @@ -1,5 +1,5 @@ package: "com.android.bluetooth.flags" -container: "com.android.btservices" +container: "com.android.bt" flag { name: "hfp_client_disconnecting_state" diff --git a/flags/hid.aconfig b/flags/hid.aconfig index 6336ac3b10..fe3fa78ec8 100644 --- a/flags/hid.aconfig +++ b/flags/hid.aconfig @@ -1,5 +1,5 @@ package: "com.android.bluetooth.flags" -container: "com.android.btservices" +container: "com.android.bt" flag { name: "break_uhid_polling_early" diff --git a/flags/l2cap.aconfig b/flags/l2cap.aconfig index fb53c10bef..7e1ca0b016 100644 --- a/flags/l2cap.aconfig +++ b/flags/l2cap.aconfig @@ -1,5 +1,5 @@ package: "com.android.bluetooth.flags" -container: "com.android.btservices" +container: "com.android.bt" flag { name: "l2cap_tx_complete_cb_info" diff --git a/flags/le_advertising.aconfig b/flags/le_advertising.aconfig index 524d0461e5..56f849ab7a 100644 --- a/flags/le_advertising.aconfig +++ b/flags/le_advertising.aconfig @@ -1,5 +1,5 @@ package: "com.android.bluetooth.flags" -container: "com.android.btservices" +container: "com.android.bt" flag { name: "nrpa_non_connectable_adv" diff --git a/flags/leaudio.aconfig b/flags/leaudio.aconfig index 5208564fd5..df77064596 100644 --- a/flags/leaudio.aconfig +++ b/flags/leaudio.aconfig @@ -1,5 +1,5 @@ package: "com.android.bluetooth.flags" -container: "com.android.btservices" +container: "com.android.bt" flag { name: "leaudio_broadcast_monitor_source_sync_status" diff --git a/flags/mapclient.aconfig b/flags/mapclient.aconfig index 97d0411683..fe8f90d81d 100644 --- a/flags/mapclient.aconfig +++ b/flags/mapclient.aconfig @@ -1,5 +1,5 @@ package: "com.android.bluetooth.flags" -container: "com.android.btservices" +container: "com.android.bt" flag { name: "handle_delivery_sending_failure_events" diff --git a/flags/mcp.aconfig b/flags/mcp.aconfig index 430bacd761..80567acae7 100644 --- a/flags/mcp.aconfig +++ b/flags/mcp.aconfig @@ -1,5 +1,5 @@ package: "com.android.bluetooth.flags" -container: "com.android.btservices" +container: "com.android.bt" flag { name: "mcp_allow_play_without_active_player" diff --git a/flags/metric.aconfig b/flags/metric.aconfig index f0c62e37fc..e8b8628ba2 100644 --- a/flags/metric.aconfig +++ b/flags/metric.aconfig @@ -1,5 +1,5 @@ package: "com.android.bluetooth.flags" -container: "com.android.btservices" +container: "com.android.bt" flag { name: "bluetooth_power_telemetry" diff --git a/flags/opp.aconfig b/flags/opp.aconfig index 6e32ab0b75..7a03aaff5a 100644 --- a/flags/opp.aconfig +++ b/flags/opp.aconfig @@ -1,5 +1,5 @@ package: "com.android.bluetooth.flags" -container: "com.android.btservices" +container: "com.android.bt" flag { name: "opp_start_activity_directly_from_notification" diff --git a/flags/pairing.aconfig b/flags/pairing.aconfig index 9d98aa158a..b66b02939d 100644 --- a/flags/pairing.aconfig +++ b/flags/pairing.aconfig @@ -1,5 +1,5 @@ package: "com.android.bluetooth.flags" -container: "com.android.btservices" +container: "com.android.bt" flag { name: "clear_auth_collision_state_on_pairing_complete" diff --git a/flags/pbapclient.aconfig b/flags/pbapclient.aconfig index dbbbb7773b..2464557d58 100644 --- a/flags/pbapclient.aconfig +++ b/flags/pbapclient.aconfig @@ -1,5 +1,5 @@ package: "com.android.bluetooth.flags" -container: "com.android.btservices" +container: "com.android.bt" flag { name: "pbap_client_storage_refactor" diff --git a/flags/ranging.aconfig b/flags/ranging.aconfig index 6b75003163..7851d5ff82 100644 --- a/flags/ranging.aconfig +++ b/flags/ranging.aconfig @@ -1,5 +1,5 @@ package: "com.android.bluetooth.flags" -container: "com.android.btservices" +container: "com.android.bt" flag { name: "channel_sounding" diff --git a/flags/rfcomm.aconfig b/flags/rfcomm.aconfig index df53931078..b724d93c7d 100644 --- a/flags/rfcomm.aconfig +++ b/flags/rfcomm.aconfig @@ -1,5 +1,5 @@ package: "com.android.bluetooth.flags" -container: "com.android.btservices" +container: "com.android.bt" flag { name: "rfcomm_always_use_mitm" diff --git a/flags/rnr.aconfig b/flags/rnr.aconfig index 6b19a5f77b..425db568d6 100644 --- a/flags/rnr.aconfig +++ b/flags/rnr.aconfig @@ -1,5 +1,5 @@ package: "com.android.bluetooth.flags" -container: "com.android.btservices" +container: "com.android.bt" flag { name: "rnr_store_device_type" diff --git a/flags/sco.aconfig b/flags/sco.aconfig index 26379f4ea1..51c6e14e24 100644 --- a/flags/sco.aconfig +++ b/flags/sco.aconfig @@ -1,5 +1,5 @@ package: "com.android.bluetooth.flags" -container: "com.android.btservices" +container: "com.android.bt" flag { name: "fix_sco_command_status_handling" diff --git a/flags/sdp.aconfig b/flags/sdp.aconfig index a20adb914a..418fa04663 100644 --- a/flags/sdp.aconfig +++ b/flags/sdp.aconfig @@ -1,5 +1,5 @@ package: "com.android.bluetooth.flags" -container: "com.android.btservices" +container: "com.android.bt" flag { name: "stack_sdp_detect_nil_property_type" diff --git a/flags/security.aconfig b/flags/security.aconfig index 40a6890649..ed5370daa8 100644 --- a/flags/security.aconfig +++ b/flags/security.aconfig @@ -1,5 +1,5 @@ package: "com.android.bluetooth.flags" -container: "com.android.btservices" +container: "com.android.bt" flag { name: "key_missing_classic_device" diff --git a/flags/service_discovery.aconfig b/flags/service_discovery.aconfig index f5569086b9..00c0741ff3 100644 --- a/flags/service_discovery.aconfig +++ b/flags/service_discovery.aconfig @@ -1,5 +1,5 @@ package: "com.android.bluetooth.flags" -container: "com.android.btservices" +container: "com.android.bt" flag { name: "prevent_duplicate_uuid_intent" diff --git a/flags/sockets.aconfig b/flags/sockets.aconfig index 5f00813a8b..e1ba818cef 100644 --- a/flags/sockets.aconfig +++ b/flags/sockets.aconfig @@ -1,5 +1,5 @@ package: "com.android.bluetooth.flags" -container: "com.android.btservices" +container: "com.android.bt" flag { name: "unix_file_socket_creation_failure" diff --git a/flags/system_service.aconfig b/flags/system_service.aconfig index fba0792eca..65caf1e60c 100644 --- a/flags/system_service.aconfig +++ b/flags/system_service.aconfig @@ -1,5 +1,5 @@ package: "com.android.bluetooth.flags" -container: "com.android.btservices" +container: "com.android.bt" flag { name: "enforce_resolve_system_service_behavior" diff --git a/flags/vcp.aconfig b/flags/vcp.aconfig index 43d5ec4c1c..612352219f 100644 --- a/flags/vcp.aconfig +++ b/flags/vcp.aconfig @@ -1,5 +1,5 @@ package: "com.android.bluetooth.flags" -container: "com.android.btservices" +container: "com.android.bt" flag { name: "vcp_mute_unmute" diff --git a/flags/vsc.aconfig b/flags/vsc.aconfig index bd67729689..af4f375849 100644 --- a/flags/vsc.aconfig +++ b/flags/vsc.aconfig @@ -1,5 +1,5 @@ package: "com.android.bluetooth.flags" -container: "com.android.btservices" +container: "com.android.bt" flag { name: "hci_vendor_specific_extension" -- cgit v1.2.3-59-g8ed1b