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

Commit 339260da authored by Ömer Faruk Yılmaz's avatar Ömer Faruk Yılmaz
Browse files

Correct scanInitializeNative mutex lock location 

See go/scan-manager-refactor for more details.

Bug: 313335632
Bug: 267361243
Bug: 327503826
Bug: 343116685
Flag: EXEMPT, mechanical refactor
Test: m com.android.btservices
Change-Id: Ie32558329609e0ee7ad626f0a7a8664da952c54c
parent 75cf51c6

android/app/jni/com_android_bluetooth_gatt.cpp

+2 −1
Original line number Diff line number Diff line
@@ -2468,10 +2468,11 @@ static void periodicScanCleanupNative(JNIEnv* env, jobject /* object */) { 
}



static void scanInitializeNative(JNIEnv* env, jobject object) {

  std::unique_lock<std::shared_mutex> lock(callbacks_mutex);



  sScanner = bluetooth::shim::get_ble_scanner_instance();

  sScanner->RegisterCallbacks(JniScanningCallbacks::GetInstance());



  std::unique_lock<std::shared_mutex> lock(callbacks_mutex);

  if (mScanCallbacksObj != NULL) {

    log::warn("Cleaning up scan callback object");

    env->DeleteGlobalRef(mScanCallbacksObj);