summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--android/app/Android.bp17
-rw-r--r--android/app/conf/Android.bp6
-rw-r--r--android/app/conf/interop_database.conf (renamed from system/conf/interop_database.conf)0
-rw-r--r--android/app/jni/com_android_bluetooth_gatt.cpp2
-rw-r--r--android/app/jni/com_android_bluetooth_le_audio.cpp2
-rw-r--r--android/app/src/com/android/bluetooth/btservice/AdapterService.java14
-rw-r--r--apex/permissions/Android.bp2
-rw-r--r--service/tests/Android.bp33
-rw-r--r--system/bta/le_audio/le_audio_set_configuration_provider_json.cc13
-rw-r--r--system/btif/src/btif_core.cc3
-rw-r--r--system/device/src/interop.cc2
-rw-r--r--system/main/stack_config.cc4
12 files changed, 42 insertions, 56 deletions
diff --git a/android/app/Android.bp b/android/app/Android.bp
index 8123e3638a..f2bb7e252b 100644
--- a/android/app/Android.bp
+++ b/android/app/Android.bp
@@ -113,7 +113,7 @@ android_app {
"--custom-package",
"com.android.bluetooth",
],
- certificate: ":com.android.bluetooth.certificate",
+ certificate: "platform",
jni_libs: ["libbluetooth_jni"],
libs: [
@@ -161,6 +161,16 @@ android_app {
optimize: false,
proguard_flags_files: ["proguard.flags"],
},
+ required: [
+ "audio_set_configurations_bfbs",
+ "audio_set_configurations_json",
+ "audio_set_scenarios_bfbs",
+ "audio_set_scenarios_json",
+ "bt_did.conf",
+ "bt_stack.conf",
+ "interop_database.conf",
+ "privapp_allowlist_com.android.bluetooth.xml",
+ ],
apex_available: [
"//apex_available:platform",
"com.android.btservices",
@@ -202,8 +212,3 @@ genrule {
" --minApiLevel 34",
out: ["com/android/bluetooth/BtRestrictedStatsLog.java"],
}
-
-android_app_certificate {
- name: "com.android.bluetooth.certificate",
- certificate: "certs/com.android.bluetooth",
-}
diff --git a/android/app/conf/Android.bp b/android/app/conf/Android.bp
new file mode 100644
index 0000000000..ad419b366d
--- /dev/null
+++ b/android/app/conf/Android.bp
@@ -0,0 +1,6 @@
+// Bluetooth interop_database.conf config file
+prebuilt_etc {
+ name: "interop_database.conf",
+ src: "interop_database.conf",
+ sub_dir: "bluetooth",
+}
diff --git a/system/conf/interop_database.conf b/android/app/conf/interop_database.conf
index c65de479a8..c65de479a8 100644
--- a/system/conf/interop_database.conf
+++ b/android/app/conf/interop_database.conf
diff --git a/android/app/jni/com_android_bluetooth_gatt.cpp b/android/app/jni/com_android_bluetooth_gatt.cpp
index d62c35876a..c33f13d0a8 100644
--- a/android/app/jni/com_android_bluetooth_gatt.cpp
+++ b/android/app/jni/com_android_bluetooth_gatt.cpp
@@ -2454,7 +2454,7 @@ static void startAdvertisingSetNative(
std::vector<uint8_t> enc_key_value;
sGattIf->advertiser->StartAdvertisingSet(
- reg_id, base::Bind(&ble_advertising_set_started_cb, reg_id), params,
+ reg_id, base::Bind(&ble_advertising_set_started_cb, reg_id, server_if), params,
data_vec, data_enc_vec, scan_resp_vec, scan_resp_enc_vec, periodicParams,
periodic_data_vec, periodic_data_enc_vec, duration, maxExtAdvEvents,
enc_key_value, base::Bind(ble_advertising_set_timeout_cb));
diff --git a/android/app/jni/com_android_bluetooth_le_audio.cpp b/android/app/jni/com_android_bluetooth_le_audio.cpp
index fcd0c3ec7e..5e627b8d41 100644
--- a/android/app/jni/com_android_bluetooth_le_audio.cpp
+++ b/android/app/jni/com_android_bluetooth_le_audio.cpp
@@ -278,7 +278,7 @@ static void classInitNative(JNIEnv* env, jclass clazz) {
jclass jniBluetoothLeAudioCodecConfigClass =
env->FindClass("android/bluetooth/BluetoothLeAudioCodecConfig");
android_bluetooth_BluetoothLeAudioCodecConfig.constructor = env->GetMethodID(
- jniBluetoothLeAudioCodecConfigClass, "<init>", "(IIIIIIIIILLLL)V");
+ jniBluetoothLeAudioCodecConfigClass, "<init>", "(IIIIIIIIIJJJJ)V");
android_bluetooth_BluetoothLeAudioCodecConfig.getCodecType = env->GetMethodID(
jniBluetoothLeAudioCodecConfigClass, "getCodecType", "()I");
diff --git a/android/app/src/com/android/bluetooth/btservice/AdapterService.java b/android/app/src/com/android/bluetooth/btservice/AdapterService.java
index 609bfceabb..b476b69737 100644
--- a/android/app/src/com/android/bluetooth/btservice/AdapterService.java
+++ b/android/app/src/com/android/bluetooth/btservice/AdapterService.java
@@ -1101,7 +1101,7 @@ public class AdapterService extends Service {
sendBroadcastMultiplePermissions(switchBufferSizeIntent, new String[] {
android.Manifest.permission.BLUETOOTH_CONNECT,
android.Manifest.permission.BLUETOOTH_PRIVILEGED
- }, null);
+ }, (String[]) null);
}
void switchCodecCallback(boolean isLowLatencyBufferSize) {
@@ -4396,6 +4396,18 @@ public class AdapterService extends Service {
}
@Override
+ public void getEncKeyMaterialValue(SynchronousResultReceiver receiver) {
+ try {
+ receiver.send(getEncKeyMaterialValue());
+ } catch (RuntimeException e) {
+ receiver.propagateException(e);
+ }
+ }
+ private byte[] getEncKeyMaterialValue() {
+ return null;
+ }
+
+ @Override
public void startRfcommListener(String name, ParcelUuid uuid, PendingIntent pendingIntent,
AttributionSource attributionSource, SynchronousResultReceiver receiver) {
try {
diff --git a/apex/permissions/Android.bp b/apex/permissions/Android.bp
index fdaad8d469..9dd62e4e05 100644
--- a/apex/permissions/Android.bp
+++ b/apex/permissions/Android.bp
@@ -6,5 +6,5 @@ prebuilt_etc {
name: "privapp_allowlist_com.android.bluetooth.xml",
src: "com.android.bluetooth.xml",
sub_dir: "permissions",
- installable: false,
+ installable: true,
}
diff --git a/service/tests/Android.bp b/service/tests/Android.bp
index 26f36df894..077a7618fc 100644
--- a/service/tests/Android.bp
+++ b/service/tests/Android.bp
@@ -66,7 +66,7 @@ android_test {
jni_libs: [
// these are needed for Extended Mockito
- "libbluetooth_jni",
+ "//packages/modules/Bluetooth/android/app:libbluetooth_jni",
"libdexmakerjvmtiagent",
"libstaticjvmtiagent",
],
@@ -79,34 +79,3 @@ android_test {
"mts-bluetooth",
],
}
-
-cc_library_shared {
- name: "libbluetooth_jni",
- srcs: ["jni/**/*.cpp"],
- header_libs: [
- "jni_headers",
- "libbluetooth_headers",
- ],
- include_dirs: [
- "packages/modules/Bluetooth/system/types",
- ],
- shared_libs: [
- "libbase",
- "libchrome",
- "liblog",
- "libnativehelper",
- ],
- static_libs: [
- "libbluetooth-types",
- ],
- cflags: [
- "-Wall",
- "-Werror",
- "-Wextra",
- "-Wno-unused-parameter",
- ],
- sanitize: {
- scs: true,
- },
- min_sdk_version: "33",
-}
diff --git a/system/bta/le_audio/le_audio_set_configuration_provider_json.cc b/system/bta/le_audio/le_audio_set_configuration_provider_json.cc
index c6ce195c56..30c40a47c2 100644
--- a/system/bta/le_audio/le_audio_set_configuration_provider_json.cc
+++ b/system/bta/le_audio/le_audio_set_configuration_provider_json.cc
@@ -43,16 +43,13 @@ using ::le_audio::CodecManager;
static const std::vector<
std::pair<const char* /*schema*/, const char* /*content*/>>
kLeAudioSetConfigs = {
- {"/apex/com.android.btservices/etc/bluetooth/le_audio/"
- "audio_set_configurations.bfbs",
- "/apex/com.android.btservices/etc/bluetooth/le_audio/"
- "audio_set_configurations.json"}};
+ {"/system/etc/bluetooth/le_audio/audio_set_configurations.bfbs",
+ "/system/etc/bluetooth/le_audio/audio_set_configurations.json"}};
static const std::vector<
std::pair<const char* /*schema*/, const char* /*content*/>>
- kLeAudioSetScenarios = {{"/apex/com.android.btservices/etc/bluetooth/"
- "le_audio/audio_set_scenarios.bfbs",
- "/apex/com.android.btservices/etc/bluetooth/"
- "le_audio/audio_set_scenarios.json"}};
+ kLeAudioSetScenarios = {
+ {"/system/etc/bluetooth/le_audio/audio_set_scenarios.bfbs",
+ "/system/etc/bluetooth/le_audio/audio_set_scenarios.json"}};
#else
static const std::vector<
std::pair<const char* /*schema*/, const char* /*content*/>>
diff --git a/system/btif/src/btif_core.cc b/system/btif/src/btif_core.cc
index deb95ad3f2..2caf74b4c0 100644
--- a/system/btif/src/btif_core.cc
+++ b/system/btif/src/btif_core.cc
@@ -76,8 +76,7 @@ static void bt_jni_msg_ready(void* context);
#if defined(TARGET_FLOSS)
#define BTE_DID_CONF_FILE "/var/lib/bluetooth/bt_did.conf"
#elif defined(__ANDROID__)
-#define BTE_DID_CONF_FILE \
- "/apex/com.android.btservices/etc/bluetooth/bt_did.conf"
+#define BTE_DID_CONF_FILE "/etc/bluetooth/bt_did.conf"
#else // !defined(__ANDROID__)
#define BTE_DID_CONF_FILE "bt_did.conf"
#endif // defined(__ANDROID__)
diff --git a/system/device/src/interop.cc b/system/device/src/interop.cc
index 052b121fac..2c2c0f52b4 100644
--- a/system/device/src/interop.cc
+++ b/system/device/src/interop.cc
@@ -55,7 +55,7 @@
static const char* INTEROP_DYNAMIC_FILE_PATH =
"/data/misc/bluedroid/interop_database_dynamic.conf";
static const char* INTEROP_STATIC_FILE_PATH =
- "/apex/com.android.btservices/etc/bluetooth/interop_database.conf";
+ "/etc/bluetooth/interop_database.conf";
#else // !__ANDROID__
#include <base/files/file_util.h>
diff --git a/system/main/stack_config.cc b/system/main/stack_config.cc
index 63d35d436f..3563450213 100644
--- a/system/main/stack_config.cc
+++ b/system/main/stack_config.cc
@@ -60,10 +60,8 @@ static std::unique_ptr<config_t> config;
static future_t* init() {
// TODO(armansito): Find a better way than searching by a hardcoded path.
-#if defined(TARGET_FLOSS)
+#if defined(TARGET_FLOSS) || defined(__ANDROID__)
const char* path = "/etc/bluetooth/bt_stack.conf";
-#elif defined(__ANDROID__)
- const char* path = "/apex/com.android.btservices/etc/bluetooth/bt_stack.conf";
#else // !defined(__ANDROID__)
const char* path = "bt_stack.conf";
#endif // defined(__ANDROID__)
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-03 07:31:02 +0000