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

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

Merge "activity_attribution: Use AServiceManager_waitForService" am: cd4a93df 

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



Change-Id: I5f75b597d4edf93a12b4ed8dea4f3d26f970132b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c9f166f6 cd4a93df

system/gd/btaa/android/activity_attribution.cc

+5 −4
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ const ModuleFactory ActivityAttribution::Factory = ModuleFactory([]() { return n 


static const std::string kBtWakelockName("hal_bluetooth_lock");

static const std::string kBtWakeupReason("hs_uart_wakeup");

static const std::string kSuspendService("suspend_control");

static const size_t kHciAclHeaderSize = 4;



static std::mutex g_module_mutex;
@@ -102,12 +103,12 @@ struct ActivityAttribution::impl { 


    Status register_callback_status;

    bool is_register_successful = false;

    auto control_service =

        ISuspendControlService::fromBinder(SpAIBinder(AServiceManager_getService("suspend_control")));

    if (!control_service) {

      LOG_ERROR("Fail to obtain suspend_control");

    if (!AServiceManager_isDeclared(kSuspendService.c_str())) {

      LOG_ERROR("No suspend control service available.");

      return;

    }

    auto control_service = ISuspendControlService::fromBinder(

        SpAIBinder(AServiceManager_waitForService(kSuspendService.c_str())));



    if (!is_wakeup_callback_registered) {

      g_wakeup_callback = SharedRefBase::make<wakeup_callback>();