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

Commit d24280c5 authored by Matt Buckley's avatar Matt Buckley Committed by Android (Google) Code Review
Browse files

Merge "Move ADPF to standalone lib" into main

parents 2db7fdce 18b9352f

services/surfaceflinger/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -177,13 +177,13 @@ cc_library_headers { 
filegroup {

    name: "libsurfaceflinger_backend_sources",

    srcs: [

        "PowerAdvisor/*.cpp",

        "DisplayHardware/AidlComposerHal.cpp",

        "DisplayHardware/ComposerHal.cpp",

        "DisplayHardware/FramebufferSurface.cpp",

        "DisplayHardware/HWC2.cpp",

        "DisplayHardware/HWComposer.cpp",

        "DisplayHardware/HidlComposerHal.cpp",

        "DisplayHardware/PowerAdvisor.cpp",

        "DisplayHardware/VirtualDisplaySurface.cpp",

    ],

}

services/surfaceflinger/CompositionEngine/include/compositionengine/DisplayCreationArgs.h

+3 −3
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#include <ui/Size.h>

#include <ui/StaticDisplayInfo.h>



#include "DisplayHardware/PowerAdvisor.h"

#include "PowerAdvisor/PowerAdvisor.h"



namespace android::compositionengine {
@@ -48,7 +48,7 @@ struct DisplayCreationArgs { 


    // Optional pointer to the power advisor interface, if one is needed for

    // this display.

    Hwc2::PowerAdvisor* powerAdvisor = nullptr;

    adpf::PowerAdvisor* powerAdvisor = nullptr;



    // Debugging. Human readable name for the display.

    std::string name;
@@ -82,7 +82,7 @@ public: 
        return *this;

    }



    DisplayCreationArgsBuilder& setPowerAdvisor(Hwc2::PowerAdvisor* powerAdvisor) {

    DisplayCreationArgsBuilder& setPowerAdvisor(adpf::PowerAdvisor* powerAdvisor) {

        mArgs.powerAdvisor = powerAdvisor;

        return *this;

    }

services/surfaceflinger/CompositionEngine/include/compositionengine/impl/Display.h

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
#include <ui/DisplayIdentification.h>



#include "DisplayHardware/HWComposer.h"

#include "DisplayHardware/PowerAdvisor.h"

#include "PowerAdvisor/PowerAdvisor.h"



namespace android::compositionengine {
@@ -102,7 +102,7 @@ private: 
    void setHintSessionRequiresRenderEngine(bool requiresRenderEngine) override;

    DisplayId mId;

    bool mIsDisconnected = false;

    Hwc2::PowerAdvisor* mPowerAdvisor = nullptr;

    adpf::PowerAdvisor* mPowerAdvisor = nullptr;

    const aidl::android::hardware::graphics::composer3::OverlayProperties* getOverlaySupport()

            override;

};

services/surfaceflinger/CompositionEngine/src/Display.cpp

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
// TODO(b/129481165): remove the #pragma below and fix conversion issues

#pragma clang diagnostic pop // ignored "-Wconversion"



#include "DisplayHardware/PowerAdvisor.h"

#include "PowerAdvisor/PowerAdvisor.h"



using aidl::android::hardware::graphics::composer3::Capability;

using aidl::android::hardware::graphics::composer3::DisplayCapability;

services/surfaceflinger/CompositionEngine/tests/DisplayTest.cpp

+3 −3
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
#include "ftl/future.h"

#include "mock/DisplayHardware/MockHWC2.h"

#include "mock/DisplayHardware/MockHWComposer.h"

#include "mock/DisplayHardware/MockPowerAdvisor.h"

#include "mock/PowerAdvisor/MockPowerAdvisor.h"



#include <aidl/android/hardware/graphics/composer3/Composition.h>
@@ -192,7 +192,7 @@ struct DisplayTestCommon : public testing::Test { 
    }



    StrictMock<android::mock::HWComposer> mHwComposer;

    StrictMock<Hwc2::mock::PowerAdvisor> mPowerAdvisor;

    StrictMock<adpf::mock::PowerAdvisor> mPowerAdvisor;

    StrictMock<renderengine::mock::RenderEngine> mRenderEngine;

    StrictMock<mock::CompositionEngine> mCompositionEngine;

    sp<mock::NativeWindow> mNativeWindow = sp<StrictMock<mock::NativeWindow>>::make();
@@ -1035,7 +1035,7 @@ struct DisplayFunctionalTest : public testing::Test { 
    }



    NiceMock<android::mock::HWComposer> mHwComposer;

    NiceMock<Hwc2::mock::PowerAdvisor> mPowerAdvisor;

    NiceMock<adpf::mock::PowerAdvisor> mPowerAdvisor;

    NiceMock<mock::CompositionEngine> mCompositionEngine;

    sp<mock::NativeWindow> mNativeWindow = sp<NiceMock<mock::NativeWindow>>::make();

    sp<mock::DisplaySurface> mDisplaySurface = sp<NiceMock<mock::DisplaySurface>>::make();