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

Commit 28887f43 authored by Xiang Wang's avatar Xiang Wang Committed by Automerger Merge Worker
Browse files

Merge "Add debug log on Power HAL support and connection status" into tm-dev... 

Merge "Add debug log on Power HAL support and connection status" into tm-dev am: 85bd15dd am: 8d265d41

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/17805730



Change-Id: Ieae20d0df643b3747121d502e313a14e57212572
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents da515292 8d265d41

services/surfaceflinger/DisplayHardware/PowerAdvisor.cpp

+4 −1
Original line number Diff line number Diff line
@@ -564,6 +564,7 @@ PowerAdvisor::HalWrapper* PowerAdvisor::getPowerHal() { 
        if (!wrapper->shouldReconnectHAL()) {

            return wrapper;

        }

        ALOGD("Reconnecting Power HAL");

        sHalWrapper = nullptr;

    }
@@ -576,7 +577,9 @@ PowerAdvisor::HalWrapper* PowerAdvisor::getPowerHal() { 
    // If that didn't succeed, attempt to connect to the HIDL Power HAL

    if (sHalWrapper == nullptr) {

        sHalWrapper = HidlPowerHalWrapper::connect();

    } else { // if AIDL, pass on any existing hint session values

    } else {

        ALOGD("Successfully connecting AIDL Power HAL");

        // if AIDL, pass on any existing hint session values

        // thread ids always safe to set

        sHalWrapper->setPowerHintSessionThreadIds(oldPowerHintSessionThreadIds);

        // only set duration and start if duration is defined

services/surfaceflinger/FlagManager.cpp

+2 −1
Original line number Diff line number Diff line
@@ -96,7 +96,8 @@ int64_t FlagManager::demo_flag() const { 
}



bool FlagManager::use_adpf_cpu_hint() const {

    std::optional<bool> sysPropVal = std::nullopt;

    std::optional<bool> sysPropVal =

            doParse<bool>(base::GetProperty("debug.sf.enable_adpf_cpu_hint", "").c_str());

    return getValue("AdpfFeature__adpf_cpu_hint", sysPropVal, false);

}

services/surfaceflinger/SurfaceFlinger.cpp

+6 −2
Original line number Diff line number Diff line
@@ -675,8 +675,12 @@ void SurfaceFlinger::bootFinished() { 


        readPersistentProperties();

        mPowerAdvisor->onBootFinished();

        mPowerAdvisor->enablePowerHint(mFlagManager.use_adpf_cpu_hint());

        if (mPowerAdvisor->usePowerHintSession()) {

        const bool powerHintEnabled = mFlagManager.use_adpf_cpu_hint();

        mPowerAdvisor->enablePowerHint(powerHintEnabled);

        const bool powerHintUsed = mPowerAdvisor->usePowerHintSession();

        ALOGD("Power hint is %s",

              powerHintUsed ? "supported" : (powerHintEnabled ? "unsupported" : "disabled"));

        if (powerHintUsed) {

            std::optional<pid_t> renderEngineTid = getRenderEngine().getRenderEngineTid();

            std::vector<int32_t> tidList;

            tidList.emplace_back(gettid());