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

Commit 1ba40dee authored by Hyundo Moon's avatar Hyundo Moon Committed by Gerrit Code Review
Browse files

Merge "Add missing reset for expected address rotation time" into main

parents ed28053b 8426c393

system/gd/hci/le_address_manager.cc

+6 −0
Original line number Diff line number Diff line
@@ -265,6 +265,12 @@ void LeAddressManager::unregister_client(LeAddressManagerCallback* callback) { 
    if (address_rotation_non_wake_alarm_ != nullptr) {

      address_rotation_non_wake_alarm_->Cancel();

    }

    if (address_rotation_interval_min.has_value()) {

      address_rotation_interval_min.reset();

    }

    if (address_rotation_interval_max.has_value()) {

      address_rotation_interval_max.reset();

    }

    log::info("Cancelled address rotation alarm");

  }

}

system/gd/hci/le_advertising_manager.cc

+6 −0
Original line number Diff line number Diff line
@@ -435,6 +435,12 @@ struct LeAdvertisingManager::impl : public bluetooth::hci::LeAddressManagerCallb 
        advertising_sets_[advertiser_id].address_rotation_non_wake_alarm_->Cancel();

        advertising_sets_[advertiser_id].address_rotation_non_wake_alarm_.reset();

      }

      if (advertising_sets_[advertiser_id].address_rotation_interval_min.has_value()) {

        advertising_sets_[advertiser_id].address_rotation_interval_min.reset();

      }

      if (advertising_sets_[advertiser_id].address_rotation_interval_max.has_value()) {

        advertising_sets_[advertiser_id].address_rotation_interval_max.reset();

      }

    }

    advertising_sets_.erase(advertiser_id);

    if (advertising_sets_.empty() && address_manager_registered) {