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

Commit 299fe6f5 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/24592263'] into udc-release. 

Change-Id: I41d24af95f967c2c803650c671863991a3ea3524
parents 5fa41f52 2f359c1d

libs/hwui/renderthread/CanvasContext.cpp

+1 −0
Original line number Diff line number Diff line
@@ -193,6 +193,7 @@ void CanvasContext::setHardwareBuffer(AHardwareBuffer* buffer) { 
void CanvasContext::setSurface(ANativeWindow* window, bool enableTimeout) {

    ATRACE_CALL();



    startHintSession();

    if (window) {

        mNativeSurface = std::make_unique<ReliableSurface>(window);

        mNativeSurface->init();

libs/hwui/renderthread/HintSessionWrapper.cpp

+9 −0
Original line number Diff line number Diff line
@@ -93,8 +93,17 @@ HintSessionWrapper::HintSessionWrapper(pid_t uiThreadId, pid_t renderThreadId) 
        : mUiThreadId(uiThreadId), mRenderThreadId(renderThreadId) {}



HintSessionWrapper::~HintSessionWrapper() {

    destroy();

}



void HintSessionWrapper::destroy() {

    if (mHintSessionFuture.valid()) {

        mHintSession = mHintSessionFuture.get();

    }

    if (mHintSession) {

        gAPH_closeSessionFn(mHintSession);

        mSessionValid = true;

        mHintSession = nullptr;

    }

}

libs/hwui/renderthread/HintSessionWrapper.h

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ public: 
    void sendLoadResetHint();

    void sendLoadIncreaseHint();

    bool init();

    void destroy();



private:

    APerformanceHintSession* mHintSession = nullptr;