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

Commit f994cedc authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5992631 from 126828b6 to rvc-release 

Change-Id: Iebc41d233a9751cb4dec905f5e625182049c0771
parents 4e1f8317 126828b6

android/app/jni/com_android_bluetooth.h

+5 −7
Original line number Diff line number Diff line
@@ -18,18 +18,17 @@ 
#ifndef COM_ANDROID_BLUETOOTH_H

#define COM_ANDROID_BLUETOOTH_H



#include <nativehelper/JNIHelp.h>

#include "android_runtime/AndroidRuntime.h"

#include "android_runtime/Log.h"

#include "hardware/bluetooth.h"

#include "hardware/hardware.h"

#include "jni.h"

#include "jni_logging.h"

#include "nativehelper/ScopedLocalRef.h"

#include "utils/Log.h"



namespace android {



JNIEnv* getCallbackEnv();

bool isCallbackThread();



class CallbackEnv {

public:
@@ -46,9 +45,8 @@ public: 
    }



    bool valid() const {

      JNIEnv *env = AndroidRuntime::getJNIEnv();

      if (!mCallbackEnv || (mCallbackEnv != env)) {

          ALOGE("%s: Callback env fail: env: %p, callback: %p", mName, env, mCallbackEnv);

      if (!mCallbackEnv || !isCallbackThread()) {

        ALOGE("%s: Callback env fail", mName);

        return false;

      }

      return true;

android/app/jni/com_android_bluetooth_a2dp.cpp

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


#define LOG_NDEBUG 0



#include "android_runtime/AndroidRuntime.h"

#include "com_android_bluetooth.h"

#include "hardware/bt_av.h"

#include "utils/Log.h"

android/app/jni/com_android_bluetooth_a2dp_sink.cpp

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


#define LOG_NDEBUG 0



#include "android_runtime/AndroidRuntime.h"

#include "com_android_bluetooth.h"

#include "hardware/bt_av.h"

#include "utils/Log.h"

android/app/jni/com_android_bluetooth_avrcp_controller.cpp

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


#define LOG_NDEBUG 0



#include "android_runtime/AndroidRuntime.h"

#include "com_android_bluetooth.h"

#include "hardware/bt_rc.h"

#include "utils/Log.h"

android/app/jni/com_android_bluetooth_avrcp_target.cpp

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include <shared_mutex>

#include <vector>



#include "android_runtime/AndroidRuntime.h"

#include "avrcp.h"

#include "com_android_bluetooth.h"

#include "utils/Log.h"