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

Commit 8426c393 authored by Hyundo Moon's avatar Hyundo Moon Committed by Omair Kamil
Browse files

Add missing reset for expected address rotation time 

When unregistering the last client, the expected address rotation time
were not reset. This generated a warning log (false alarm) when starting
a new scanning after unregistering all clients.

This CL only affects variables for logging purposes.

Bug: 344712454
Flag: EXEMPT, only affects logging
Test: m -j;
Test: Unregister scan client and start a new scan.
      The warning log is not printed.
Change-Id: I78f9154fdffd2e34de19cd55d1fef113bd3eac17
parent c1bc65e3

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) {