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

Commit 7c2fcbd1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove the boot completed check from libbinder" into main

parents 5ae553fc d66ad88b

libs/binder/BinderStatsPusher.cpp

+0 −8
Original line number Original line Diff line number Diff line
@@ -40,14 +40,6 @@ sp<os::IStatsBootstrapAtomService> BinderStatsPusher::getBootstrapAtomServiceLoc 
    if (!mLastServiceCheckSucceeded && (mServiceCheckTimeSec + kCheckServiceTimeoutSec > nowSec)) {

    if (!mLastServiceCheckSucceeded && (mServiceCheckTimeSec + kCheckServiceTimeoutSec > nowSec)) {

        return nullptr;

        return nullptr;

    };

    };

    if (!mBootComplete) {

        // TODO(b/299356196): use gSystemBootCompleted instead

        if (android::base::GetIntProperty("sys.boot_completed", 0) == 0) {

            return nullptr;

        }

    }

    // store a boolean to reduce GetProperty calls

    mBootComplete = true;

    auto sm = defaultServiceManager();

    auto sm = defaultServiceManager();

    if (!sm) {

    if (!sm) {

        LOG_ALWAYS_FATAL("defaultServiceManager() returned nullptr.");

        LOG_ALWAYS_FATAL("defaultServiceManager() returned nullptr.");

libs/binder/BinderStatsPusher.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -83,8 +83,6 @@ private: 
                               SpamStatsKeyHash,   // Hash

                               SpamStatsKeyHash,   // Hash

                               SpamStatsKeyEqual>; // KeyEqual

                               SpamStatsKeyEqual>; // KeyEqual





    // TODO(b/299356196): replace with gSystemBootCompleted

    bool mBootComplete = false;

    // If last service check was a success.

    // If last service check was a success.

    bool mLastServiceCheckSucceeded = true;

    bool mLastServiceCheckSucceeded = true;

    // time of last check

    // time of last check