Merge changes I97ca96d5,Ie3d023b3,Ief254d37,I83b23ce1 am: b671abf7

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



Change-Id: Ibca4a4ee29d092d21ff2b0e7e19b6dc50411a7d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

android/pandora/server/Android.bp

@@ -10,8 +10,11 @@ java_library_static {
     sdk_version: "core_platform",
 
     libs: [
+        // order matters: classes in framework-bluetooth are resolved before framework, meaning
+        // @hide APIs in framework-bluetooth are resolved before @SystemApi stubs in framework
         // Access to hidden apis in Bluetooth:
         "framework-bluetooth.impl",
+
         "framework",
     ],
 

apex/Android.bp

@@ -22,8 +22,8 @@ apex {
     systemserverclasspath_fragments: ["com.android.btservices-systemserverclasspath-fragment"],
     compat_configs: [
         "bluetooth-compat-config",
-        "framework-bluetooth-compat-config",
         "bluetoothapk-platform-compat-config",
+        "framework-bluetooth-compat-config",
     ],
     apps: ["Bluetooth"],
 
@@ -41,9 +41,9 @@ apex {
         "audio_set_configurations_json",
         "audio_set_scenarios_bfbs",
         "audio_set_scenarios_json",
-        "btservices-linker-config",
         "bt_did.conf",
         "bt_stack.conf",
+        "btservices-linker-config",
         "interop_database.conf",
         "privapp_allowlist_com.android.bluetooth.xml",
     ],

framework/Android.bp

@@ -11,8 +11,8 @@ filegroup {
     name: "framework-bluetooth-sources",
     defaults: ["framework-sources-module-defaults"],
     srcs: [
-        "java/**/*.java",
         "java/**/*.aidl",
+        "java/**/*.java",
     ],
     path: "java",
 }
@@ -24,13 +24,13 @@ java_defaults {
     name: "framework-bluetooth-defaults",
     defaults: ["bluetooth-module-sdk-version-defaults"],
     static_libs: [
-        "modules-utils-synchronous-result-receiver",
         "PlatformProperties",
+        "modules-utils-synchronous-result-receiver",
     ],
     libs: [
+        "app-compat-annotations",
         "framework-tethering.stubs.module_lib",
         "unsupportedappusage", // for android.compat.annotation.UnsupportedAppUsage
-        "app-compat-annotations",
     ],
     stub_only_libs: ["framework-tethering.stubs.module_lib"],
     srcs: [
@@ -53,8 +53,8 @@ java_library {
 java_sdk_library {
     name: "framework-bluetooth",
     defaults: [
-        "framework-module-defaults",
         "framework-bluetooth-defaults",
+        "framework-module-defaults",
     ],
 
     jarjar_rules: ":bluetooth-jarjar-rules",
@@ -96,14 +96,14 @@ java_defaults {
     name: "framework-bluetooth-tests-defaults",
     sdk_version: "core_platform",
     libs: [
+        "app-compat-annotations",
         // order matters: classes in framework-bluetooth are resolved before framework, meaning
         // @hide APIs in framework-bluetooth are resolved before @SystemApi stubs in framework
         "framework-bluetooth.impl",
-        "framework",
 
+        "framework",
         // if sdk_version="" this gets automatically included, but here we need to add manually.
         "framework-res",
-        "app-compat-annotations",
     ],
     defaults_visibility: ["//visibility:public"],
 }

framework/tests/stress/Android.bp

@@ -17,8 +17,8 @@ android_test {
         exclude_filter: [],
     },
     libs: [
-        "android.test.runner",
         "android.test.base",
+        "android.test.runner",
     ],
     static_libs: [
         "androidx.test.rules",

framework/tests/unit/Android.bp

@@ -17,8 +17,8 @@ android_test {
         exclude_filter: [],
     },
     libs: [
-        "android.test.runner",
         "android.test.base",
+        "android.test.runner",
     ],
     static_libs: [
         "androidx.test.ext.truth",

pandora/interfaces/Android.bp

@@ -19,8 +19,8 @@ java_library {
     ],
     proto: {
         include_dirs: [
-            "external/protobuf/src",
             "external/pandora/bt-test-interfaces",
+            "external/protobuf/src",
             "packages/modules/Bluetooth/pandora/interfaces",
         ],
         plugin: "grpc-java-plugin",
@@ -34,9 +34,9 @@ java_library {
     name: "pandora_experimental-proto-java",
     visibility: ["//packages/modules/Bluetooth/android/pandora/server"],
     srcs: [
+        ":libprotobuf-internal-protos",
         ":pandora-protos",
         "pandora_experimental/*.proto",
-        ":libprotobuf-internal-protos",
     ],
     static_libs: [
         "libprotobuf-java-lite",
@@ -47,8 +47,8 @@ java_library {
         canonical_path_from_root: false,
         type: "lite",
         include_dirs: [
-            "external/protobuf/src",
             "external/pandora/bt-test-interfaces",
+            "external/protobuf/src",
             "packages/modules/Bluetooth/pandora/interfaces",
         ],
     },

pandora/interfaces/python/Android.bp

@@ -23,13 +23,12 @@ genrule {
         ":pandora_experimental-protos",
     ],
     out: [
-        "pandora_experimental/py.typed",
         "pandora_experimental/__init__.py",
-        "pandora_experimental/_utils.py",
         "pandora_experimental/_android_grpc.py",
         "pandora_experimental/_android_grpc_aio.py",
         "pandora_experimental/_android_pb2.py",
         "pandora_experimental/_android_pb2.pyi",
+        "pandora_experimental/_utils.py",
         "pandora_experimental/a2dp_grpc.py",
         "pandora_experimental/a2dp_grpc_aio.py",
         "pandora_experimental/a2dp_pb2.py",
@@ -70,6 +69,7 @@ genrule {
         "pandora_experimental/pbap_grpc_aio.py",
         "pandora_experimental/pbap_pb2.py",
         "pandora_experimental/pbap_pb2.pyi",
+        "pandora_experimental/py.typed",
         "pandora_experimental/rfcomm_grpc.py",
         "pandora_experimental/rfcomm_grpc_aio.py",
         "pandora_experimental/rfcomm_pb2.py",
@@ -90,7 +90,6 @@ filegroup {
 filegroup {
     name: "pandora_experimental-python-stubs",
     srcs: [
-        ":pandora_experimental-python-gen-src{pandora_experimental/py.typed}",
         ":pandora_experimental-python-gen-src{pandora_experimental/_android_pb2.pyi}",
         ":pandora_experimental-python-gen-src{pandora_experimental/a2dp_pb2.pyi}",
         ":pandora_experimental-python-gen-src{pandora_experimental/asha_pb2.pyi}",
@@ -102,6 +101,7 @@ filegroup {
         ":pandora_experimental-python-gen-src{pandora_experimental/mediaplayer_pb2.pyi}",
         ":pandora_experimental-python-gen-src{pandora_experimental/pan_pb2.pyi}",
         ":pandora_experimental-python-gen-src{pandora_experimental/pbap_pb2.pyi}",
+        ":pandora_experimental-python-gen-src{pandora_experimental/py.typed}",
         ":pandora_experimental-python-gen-src{pandora_experimental/rfcomm_pb2.pyi}",
     ],
 }

pandora/server/Android.bp

@@ -22,11 +22,11 @@ python_library_host {
         "bumble_experimental/*.py",
     ],
     libs: [
+        "bumble",
         "libprotobuf-python",
         "pandora_experimental-python",
-        "bumble",
     ],
     data: [
         "bumble_experimental/py.typed",
-    ]
+    ],
 }

service/Android.bp

@@ -19,8 +19,8 @@ package {
 filegroup {
     name: "services.bluetooth-sources",
     srcs: [
-        "java/**/*.java",
         ":statslog-bluetooth-java-gen",
+        "java/**/*.java",
     ],
     visibility: [
         "//frameworks/base/services",
@@ -56,20 +56,20 @@ java_library {
         strict_updatability_linting: true,
     },
     libs: [
+        "app-compat-annotations",
         "framework-annotations-lib",
         "framework-bluetooth-pre-jarjar",
         "framework-configinfrastructure",
-        "app-compat-annotations",
         "framework-statsd.stubs.module_lib",
     ],
 
     static_libs: [
         "androidx.annotation_annotation",
         "androidx.appcompat_appcompat",
-        "modules-utils-shell-command-handler",
         "bluetooth-manager-service-proto-java-gen",
-        "bluetooth-proto-enums-java-gen",
         "bluetooth-nano-protos",
+        "bluetooth-proto-enums-java-gen",
+        "modules-utils-shell-command-handler",
     ],
 
     apex_available: [
@@ -85,13 +85,13 @@ java_library {
     defaults: ["service-bluetooth-common-defaults"],
     installable: true,
     static_libs: [
-        "service-bluetooth-pre-jarjar",
         "androidx.appcompat_appcompat",
+        "service-bluetooth-pre-jarjar",
     ],
 
     libs: [
-        "framework-bluetooth.impl",
         "app-compat-annotations",
+        "framework-bluetooth.impl",
     ],
     sdk_version: "system_server_current",
 

service/tests/Android.bp

@@ -30,9 +30,9 @@ android_test {
 
     static_libs: [
         "androidx.test.rules",
+        "frameworks-base-testutils",
         "mockito-target-extended-minus-junit4",
         "platform-test-annotations",
-        "frameworks-base-testutils",
         "truth-prebuilt",
 
         // Statically link service-bluetooth-pre-jarjar since we want to test the working copy of
@@ -46,17 +46,17 @@ android_test {
     jarjar_rules: ":bluetooth-jarjar-rules",
 
     libs: [
-        "android.test.runner",
         "android.test.base",
         "android.test.mock",
+        "android.test.runner",
         "framework-bluetooth-pre-jarjar",
     ],
 
     jni_libs: [
         // these are needed for Extended Mockito
+        "libbluetooth_jni",
         "libdexmakerjvmtiagent",
         "libstaticjvmtiagent",
-        "libbluetooth_jni",
     ],
     compile_multilib: "both",
     certificate: ":com.android.bluetooth.certificate",

system/gd/Android.bp

@@ -108,14 +108,19 @@ cc_defaults {
     ],
     tidy_flags: [
         "--header-filter=^.*packages/modules/Bluetooth/system/.*.h$",
+
         "--extra-arg-before=-Xclang",
         "--extra-arg-before=-analyzer-config",
+
         "--extra-arg-before=-Xclang",
         "--extra-arg-before=optin.cplusplus.UninitializedObject:Pedantic=true",
+
         "--extra-arg-before=-Xclang",
         "--extra-arg-before=-analyzer-config",
+
         "--extra-arg-before=-Xclang",
         "--extra-arg-before=optin.cplusplus.UninitializedObject:CheckPointeeInitialization=true",
+
     ],
 }
 
@@ -427,7 +432,7 @@ cc_test {
         "libbt_callbacks_cxx",
         "libbt_shim_bridge",
         "libbt_shim_ffi",
-        "libbt-platform-protos-lite"
+        "libbt-platform-protos-lite",
     ],
     shared_libs: [
         "libcrypto",
@@ -642,6 +647,7 @@ rust_library {
     crate_name: "bt_packets",
     srcs: [
         "rust/packets/lib.rs",
+
         ":BluetoothGeneratedPackets_rust",
     ],
     edition: "2018",
@@ -666,6 +672,7 @@ rust_library {
     crate_name: "bt_packets",
     srcs: [
         "rust/packets/lib.rs",
+
         ":BluetoothGeneratedPackets_rust",
     ],
     edition: "2018",
@@ -689,6 +696,7 @@ rust_test_host {
     ],
     srcs: [
         "rust/packets/lib.rs",
+
         ":BluetoothGeneratedPackets_rust",
     ],
     test_suites: ["general-tests"],
@@ -725,6 +733,7 @@ rust_test_host {
     ],
     srcs: [
         "rust/packets/test_lib.rs",
+
         ":TestGeneratedPackets_rust",
     ],
     test_suites: ["general-tests"],

system/gd/common/Android.bp

@@ -12,8 +12,8 @@ filegroup {
     srcs: [
         "audit_log.cc",
         "metric_id_manager.cc",
-        "strings.cc",
         "stop_watch.cc",
+        "strings.cc",
     ],
 }
 

system/gd/dumpsys/Android.bp

@@ -34,18 +34,18 @@ genrule {
     ],
     cmd: "$(location flatc) -I packages/modules/Bluetooth/system/gd -b --schema -o $(genDir) --cpp $(in) ",
     srcs: [
-        "test_data/root.fbs",
         "test_data/bar.fbs",
         "test_data/baz.fbs",
         "test_data/foo.fbs",
         "test_data/qux.fbs",
+        "test_data/root.fbs",
     ],
     out: [
-        "root_generated.h",
         "bar_generated.h",
         "baz_generated.h",
         "foo_generated.h",
         "qux_generated.h",
+        "root_generated.h",
     ],
 }
 
@@ -57,18 +57,18 @@ genrule {
     ],
     cmd: "$(location flatc) -I packages/modules/Bluetooth/system/gd -b --schema -o $(genDir) --cpp $(in) ",
     srcs: [
-        "test_data/root.fbs",
         "test_data/bar.fbs",
         "test_data/baz.fbs",
         "test_data/foo.fbs",
         "test_data/qux.fbs",
+        "test_data/root.fbs",
     ],
     out: [
-        "root.bfbs",
         "bar.bfbs",
         "baz.bfbs",
         "foo.bfbs",
         "qux.bfbs",
+        "root.bfbs",
     ],
 }
 
@@ -127,8 +127,8 @@ genrule {
         "bluetooth_flatbuffer_test.fbs",
     ],
     out: [
-        "bluetooth_flatbuffer_test_generated.h",
         "bluetooth_flatbuffer_test.bfbs",
+        "bluetooth_flatbuffer_test_generated.h",
     ],
 }
 
@@ -136,9 +136,9 @@ cc_library {
     name: "libbluetooth-dumpsys",
     host_supported: true,
     defaults: [
-        "gd_defaults",
         "gd_clang_file_coverage",
         "gd_clang_tidy",
+        "gd_defaults",
     ],
     generated_sources: [
         "BluetoothGeneratedDumpsysBundledSchema_cc",
@@ -153,9 +153,9 @@ cc_library {
     name: "libbluetooth-dumpsys-test",
     host_supported: true,
     defaults: [
-        "gd_defaults",
         "gd_clang_file_coverage",
         "gd_clang_tidy",
+        "gd_defaults",
     ],
     generated_sources: [
         "BluetoothGeneratedDumpsysBundledTestSchema_cc",
@@ -166,9 +166,9 @@ cc_library {
     name: "libbluetooth-dumpsys-unittest",
     host_supported: true,
     defaults: [
-        "gd_defaults",
         "gd_clang_file_coverage",
         "gd_clang_tidy",
+        "gd_defaults",
     ],
     generated_headers: [
         "BluetoothGeneratedDumpsysTestSchema_cc",
@@ -179,17 +179,17 @@ cc_test {
     name: "bluetooth_flatbuffer_tests",
     test_suites: ["device-tests"],
     defaults: [
+        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_common_options",
         "mts_defaults",
-        "bluetooth_gtest_x86_asan_workaround",
     ],
     host_supported: true,
     test_options: {
         unit_test: true,
     },
     static_libs: [
-        "libgmock",
         "libflatbuffers-cpp",
+        "libgmock",
     ],
     srcs: [
         "bluetooth_flatbuffer_test.cc",

system/gd/dumpsys/bundler/Android.bp

@@ -41,8 +41,8 @@ genrule {
         "bundler_schema.fbs",
     ],
     out: [
-        "bundler_schema_generated.h",
         "bundler_schema.bfbs",
+        "bundler_schema_generated.h",
     ],
 }
 

system/gd/hal/Android.bp

@@ -20,9 +20,9 @@ filegroup {
 filegroup {
     name: "BluetoothHalTestSources",
     srcs: [
-        "snoop_logger_test.cc",
         "snoop_logger_socket_test.cc",
         "snoop_logger_socket_thread_test.cc",
+        "snoop_logger_test.cc",
     ],
 }
 

system/gd/hci/Android.bp

@@ -20,13 +20,13 @@ filegroup {
     name: "BluetoothHciSources",
     srcs: [
         ":BluetoothHciPacketSources",
+        "acl_manager.cc",
         "acl_manager/acl_connection.cc",
+        "acl_manager/acl_fragmenter.cc",
         "acl_manager/acl_scheduler.cc",
         "acl_manager/classic_acl_connection.cc",
         "acl_manager/le_acl_connection.cc",
         "acl_manager/round_robin_scheduler.cc",
-        "acl_manager/acl_fragmenter.cc",
-        "acl_manager.cc",
         "controller.cc",
         "distance_measurement_manager.cc",
         "hci_layer.cc",
@@ -48,13 +48,13 @@ filegroup {
     srcs: [
         ":BluetoothHalFake",
         "acl_builder_test.cc",
-        "acl_manager_test.cc",
-        "acl_manager_unittest.cc",
         "acl_manager/acl_scheduler_test.cc",
         "acl_manager/classic_acl_connection_test.cc",
         "acl_manager/le_acl_connection_test.cc",
         "acl_manager/le_impl_test.cc",
         "acl_manager/round_robin_scheduler_test.cc",
+        "acl_manager_test.cc",
+        "acl_manager_unittest.cc",
         "address_unittest.cc",
         "address_with_type_test.cc",
         "class_of_device_unittest.cc",
@@ -64,22 +64,22 @@ filegroup {
         "hci_layer_test.cc",
         "hci_layer_unittest.cc",
         "hci_packets_test.cc",
-        "remote_name_request_test.cc",
-        "uuid_unittest.cc",
+        "le_address_manager_test.cc",
+        "le_advertising_manager_test.cc",
         "le_periodic_sync_manager_test.cc",
         "le_scanning_manager_test.cc",
         "le_scanning_reassembler_test.cc",
-        "le_advertising_manager_test.cc",
-        "le_address_manager_test.cc",
+        "remote_name_request_test.cc",
+        "uuid_unittest.cc",
     ],
 }
 
 filegroup {
     name: "BluetoothFacade_hci_layer",
     srcs: [
-        "facade/facade.cc",
         "facade/acl_manager_facade.cc",
         "facade/controller_facade.cc",
+        "facade/facade.cc",
         "facade/le_acl_manager_facade.cc",
         "facade/le_advertising_manager_facade.cc",
         "facade/le_initiator_address_facade.cc",
@@ -97,9 +97,9 @@ filegroup {
 filegroup {
     name: "BluetoothHciFuzzHelperSources",
     srcs: [
-        "fuzz/status_vs_complete_commands.cc",
-        "fuzz/hci_layer_fuzz_client.cc",
         "fuzz/fuzz_hci_layer.cc",
+        "fuzz/hci_layer_fuzz_client.cc",
+        "fuzz/status_vs_complete_commands.cc",
     ],
 }
 

system/gd/iso/Android.bp

@@ -10,9 +10,9 @@ package {
 filegroup {
     name: "BluetoothIsoSources",
     srcs: [
+        "internal/iso_manager_impl.cc",
         "iso_manager.cc",
         "iso_module.cc",
-        "internal/iso_manager_impl.cc",
     ],
 }
 

system/gd/l2cap/Android.bp

@@ -10,21 +10,21 @@ package {
 filegroup {
     name: "BluetoothL2capSources",
     srcs: [
-        "fcs.cc",
         "classic/dynamic_channel_manager.cc",
         "classic/dynamic_channel_service.cc",
         "classic/fixed_channel.cc",
         "classic/fixed_channel_manager.cc",
         "classic/fixed_channel_service.cc",
+        "classic/internal/dumpsys_helper.cc",
         "classic/internal/dynamic_channel_service_manager_impl.cc",
         "classic/internal/fixed_channel_impl.cc",
         "classic/internal/fixed_channel_service_manager_impl.cc",
         "classic/internal/link.cc",
         "classic/internal/link_manager.cc",
         "classic/internal/signalling_manager.cc",
-        "classic/internal/dumpsys_helper.cc",
         "classic/l2cap_classic_module.cc",
         "dynamic_channel.cc",
+        "fcs.cc",
         "internal/basic_mode_channel_data_controller.cc",
         "internal/data_pipeline_manager.cc",
         "internal/dynamic_channel_allocator.cc",
@@ -40,7 +40,6 @@ filegroup {
         "le/fixed_channel.cc",
         "le/fixed_channel_manager.cc",
         "le/fixed_channel_service.cc",
-        "le/link_options.cc",
         "le/internal/dynamic_channel_service_manager_impl.cc",
         "le/internal/fixed_channel_impl.cc",
         "le/internal/fixed_channel_service_manager_impl.cc",
@@ -48,6 +47,7 @@ filegroup {
         "le/internal/link_manager.cc",
         "le/internal/signalling_manager.cc",
         "le/l2cap_le_module.cc",
+        "le/link_options.cc",
     ],
 }
 
@@ -57,8 +57,8 @@ filegroup {
         "classic/internal/dynamic_channel_service_manager_test.cc",
         "classic/internal/fixed_channel_impl_test.cc",
         "classic/internal/fixed_channel_service_manager_test.cc",
-        "classic/internal/link_test.cc",
         "classic/internal/link_manager_test.cc",
+        "classic/internal/link_test.cc",
         "classic/internal/signalling_manager_test.cc",
         "internal/basic_mode_channel_data_controller_test.cc",
         "internal/dynamic_channel_allocator_test.cc",

system/gd/l2cap/fuzz/Android.bp

@@ -11,25 +11,25 @@ cc_fuzz {
     name: "bluetooth_gd_l2cap_fuzzer",
     defaults: ["gd_fuzz_defaults"],
     include_dirs: [
+        "hardware/interfaces/keymaster/4.0/support/include",
         "packages/modules/Bluetooth/system",
-        "packages/modules/Bluetooth/system/gd",
+        "packages/modules/Bluetooth/system/bta/dm",
         "packages/modules/Bluetooth/system/bta/include",
         "packages/modules/Bluetooth/system/bta/sys",
-        "packages/modules/Bluetooth/system/bta/dm",
+        "packages/modules/Bluetooth/system/btif/co",
+        "packages/modules/Bluetooth/system/btif/include",
+        "packages/modules/Bluetooth/system/embdrv/sbc/decoder/include",
+        "packages/modules/Bluetooth/system/embdrv/sbc/encoder/include",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/internal_include",
-        "packages/modules/Bluetooth/system/stack/include",
-        "packages/modules/Bluetooth/system/stack/l2cap",
         "packages/modules/Bluetooth/system/stack/a2dp",
-        "packages/modules/Bluetooth/system/stack/btm",
         "packages/modules/Bluetooth/system/stack/avdt",
+        "packages/modules/Bluetooth/system/stack/btm",
+        "packages/modules/Bluetooth/system/stack/include",
+        "packages/modules/Bluetooth/system/stack/l2cap",
         "packages/modules/Bluetooth/system/udrv/include",
-        "packages/modules/Bluetooth/system/btif/include",
-        "packages/modules/Bluetooth/system/btif/co",
         "packages/modules/Bluetooth/system/vnd/include",
-        "packages/modules/Bluetooth/system/embdrv/sbc/encoder/include",
-        "packages/modules/Bluetooth/system/embdrv/sbc/decoder/include",
         "system/security/keystore/include",
-        "hardware/interfaces/keymaster/4.0/support/include",
     ],
     srcs: [
         "channel_fuzz_controller.cc",

system/gd/metrics/Android.bp

@@ -12,7 +12,7 @@ filegroup {
     srcs: [
         "counter_metrics.cc",
         "metrics_state.cc",
-        "utils.cc"
+        "utils.cc",
     ],
 }
 
@@ -20,6 +20,6 @@ filegroup {
     name: "BluetoothMetricsTestSources",
     srcs: [
         "counter_metrics_unittest.cc",
-        "metrics_state_unittest.cc"
+        "metrics_state_unittest.cc",
     ],
 }