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

Commit d2b0cf32 authored by Henri Chataing's avatar Henri Chataing Committed by Automerger Merge Worker
Browse files

Merge changes I50cb8ffe,I1347f840,I04bae75c,I29b7e293 into main am: cae22363 

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



Change-Id: I6dfb62e6102706f1e80a6735658ba95d70a74003
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0427b630 cae22363

android/app/jni/com_android_bluetooth_a2dp.cpp

+4 −4
Original line number Diff line number Diff line
@@ -16,13 +16,13 @@ 


#define LOG_TAG "BluetoothA2dpServiceJni"



#include "com_android_bluetooth.h"

#include "hardware/bt_av.h"

#include "utils/Log.h"



#include <string.h>



#include <shared_mutex>



#include "com_android_bluetooth.h"

#include "hardware/bt_av.h"



namespace android {

static jmethodID method_onConnectionStateChanged;

static jmethodID method_onAudioStateChanged;

android/app/jni/com_android_bluetooth_a2dp_sink.cpp

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 


#include "com_android_bluetooth.h"

#include "hardware/bt_av.h"

#include "utils/Log.h"



namespace android {

static jmethodID method_onConnectionStateChanged;

android/app/jni/com_android_bluetooth_avrcp_controller.cpp

+4 −4
Original line number Diff line number Diff line
@@ -16,13 +16,13 @@ 


#define LOG_TAG "BluetoothAvrcpControllerJni"



#include "com_android_bluetooth.h"

#include "hardware/bt_rc.h"

#include "utils/Log.h"



#include <string.h>



#include <shared_mutex>



#include "com_android_bluetooth.h"

#include "hardware/bt_rc.h"



namespace android {

static jmethodID method_onConnectionStateChanged;

static jmethodID method_handleplayerappsetting;

android/app/jni/com_android_bluetooth_avrcp_target.cpp

+1 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 


#include <base/functional/bind.h>

#include <base/functional/callback.h>



#include <map>

#include <mutex>

#include <shared_mutex>
@@ -25,7 +26,6 @@ 


#include "avrcp.h"

#include "com_android_bluetooth.h"

#include "utils/Log.h"



using namespace bluetooth::avrcp;

android/app/jni/com_android_bluetooth_btservice_AdapterService.cpp

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
#include "com_android_bluetooth.h"

#include "hardware/bt_sock.h"

#include "os/logging/log_adapter.h"

#include "utils/Log.h"

#include "utils/misc.h"



using bluetooth::Uuid;