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

Commit c988a2fb authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "gd: Do not crash when set scan parameter fail (1/2)" am: 647cd215 

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

Change-Id: I19219bea06e05b9c76d19f6e30520ece50f40795
parents 8347927f 647cd215

android/app/jni/com_android_bluetooth_gatt.cpp

+8 −1
Original line number Diff line number Diff line
@@ -878,6 +878,13 @@ class JniScanningCallbacks : ScanningCallbacks { 
                                 status, scannerId, UUID_PARAMS(app_uuid));

  }



  void OnSetScannerParameterComplete(uint8_t scannerId, uint8_t status) {

    CallbackEnv sCallbackEnv(__func__);

    if (!sCallbackEnv.valid()) return;

    sCallbackEnv->CallVoidMethod(

        mCallbacksObj, method_onScanParamSetupCompleted, status, scannerId);

  }



  void OnScanResult(uint16_t event_type, uint8_t addr_type, RawAddress bda,

                    uint8_t primary_phy, uint8_t secondary_phy,

                    uint8_t advertising_sid, int8_t tx_power, int8_t rssi,
@@ -1371,7 +1378,7 @@ static void gattSetScanParametersNative(JNIEnv* env, jobject object, 
                                        jint scan_window_unit) {

  if (!sGattIf) return;

  sGattIf->scanner->SetScanParameters(

      scan_interval_unit, scan_window_unit,

      client_if, scan_interval_unit, scan_window_unit,

      base::Bind(&set_scan_params_cmpl_cb, client_if));

}