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

Commit ae137a8c authored by Jack He's avatar Jack He Committed by Automerger Merge Worker
Browse files

Merge changes I66adb8f1,I0e4f1ae8 into tm-dev am: 0c9df3ab am: af86a1a7 

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



Change-Id: I6bea9ab616ad5aab9ba6c2b532b55e78473355f6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 16f56d03 af86a1a7

system/btif/src/btif_ble_scanner.cc

+6 −0
Original line number Diff line number Diff line
@@ -341,6 +341,7 @@ class BleScannerInterfaceImpl : public BleScannerInterface { 
      uint8_t status_no_resource = 2;

      callbacks_->OnPeriodicSyncStarted(reg_id, status_no_resource, -1, sid, 1,

                                        address, 0, 0);

      return;

    }

    StartSyncCb start_sync_cb =

        base::Bind(&ScanningCallbacks::OnPeriodicSyncStarted,
@@ -362,6 +363,7 @@ class BleScannerInterfaceImpl : public BleScannerInterface { 
    const controller_t* controller = controller_get_interface();

    if (!controller->supports_ble_periodic_advertising_sync_transfer_sender()) {

      LOG_ERROR("PAST not supported by controller");

      return;

    }

    do_in_main_thread(FROM_HERE, base::Bind(&BTM_BleStopPeriodicSync, handle));

  }
@@ -374,6 +376,7 @@ class BleScannerInterfaceImpl : public BleScannerInterface { 
    const controller_t* controller = controller_get_interface();

    if (!controller->supports_ble_periodic_advertising_sync_transfer_sender()) {

      LOG_ERROR("PAST not supported by controller");

      return;

    }

    do_in_main_thread(FROM_HERE,

                      base::Bind(&BTM_BleCancelPeriodicSync, sid, address));
@@ -388,6 +391,7 @@ class BleScannerInterfaceImpl : public BleScannerInterface { 
      LOG_ERROR("PAST not supported by controller");

      callbacks_->OnPeriodicSyncTransferred(pa_source, status_no_resource,

                                            address);

      return;

    }

    SyncTransferCb sync_transfer_cb =

        base::Bind(&ScanningCallbacks::OnPeriodicSyncTransferred,
@@ -408,6 +412,7 @@ class BleScannerInterfaceImpl : public BleScannerInterface { 
      LOG_ERROR(" PAST not supported by controller");

      callbacks_->OnPeriodicSyncTransferred(pa_source, status_no_resource,

                                            address);

      return;

    }

    SyncTransferCb sync_transfer_cb =

        base::Bind(&ScanningCallbacks::OnPeriodicSyncTransferred,
@@ -428,6 +433,7 @@ class BleScannerInterfaceImpl : public BleScannerInterface { 
      LOG_ERROR(" PAST not supported by controller");

      callbacks_->OnPeriodicSyncStarted(reg_id, status_no_resource, -1, -1, 1,

                                        addr, 0, 0);

      return;

    }

    StartSyncCb start_sync_cb =

        base::Bind(&ScanningCallbacks::OnPeriodicSyncStarted,