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

Commit f4eb2ca0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix for Surface#lockHardwareCanvas lockups"

parents 3f0a602a cd18c227

core/jni/android_view_ThreadedRenderer.cpp

+4 −1
Original line number Diff line number Diff line
@@ -180,10 +180,13 @@ static void android_view_ThreadedRenderer_setSurface(JNIEnv* env, jobject clazz, 
    if (jsurface) {

        surface = android_view_Surface_getSurface(env, jsurface);

    }

    bool enableTimeout = true;

    if (discardBuffer) {

        // Currently only Surface#lockHardwareCanvas takes this path

        enableTimeout = false;

        proxy->setSwapBehavior(SwapBehavior::kSwap_discardBuffer);

    }

    proxy->setSurface(surface);

    proxy->setSurface(surface, enableTimeout);

}



static jboolean android_view_ThreadedRenderer_pause(JNIEnv* env, jobject clazz,

libs/hwui/renderthread/CanvasContext.cpp

+5 −3
Original line number Diff line number Diff line
@@ -140,13 +140,15 @@ void CanvasContext::destroy() { 
    mAnimationContext->destroy();

}



void CanvasContext::setSurface(sp<Surface>&& surface) {

void CanvasContext::setSurface(sp<Surface>&& surface, bool enableTimeout) {

    ATRACE_CALL();



    if (surface) {

        mNativeSurface = new ReliableSurface{std::move(surface)};

        if (enableTimeout) {

            // TODO: Fix error handling & re-shorten timeout

            ANativeWindow_setDequeueTimeout(mNativeSurface.get(), 4000_ms);

        }

    } else {

        mNativeSurface = nullptr;

    }

libs/hwui/renderthread/CanvasContext.h

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ public: 
    // Won't take effect until next EGLSurface creation

    void setSwapBehavior(SwapBehavior swapBehavior);



    void setSurface(sp<Surface>&& surface);

    void setSurface(sp<Surface>&& surface, bool enableTimeout = true);

    bool pauseSurface();

    void setStopped(bool stopped);

    bool hasSurface() const { return mNativeSurface.get(); }

libs/hwui/renderthread/RenderProxy.cpp

+4 −3
Original line number Diff line number Diff line
@@ -78,9 +78,10 @@ void RenderProxy::setName(const char* name) { 
    mRenderThread.queue().runSync([this, name]() { mContext->setName(std::string(name)); });

}



void RenderProxy::setSurface(const sp<Surface>& surface) {

    mRenderThread.queue().post(

            [this, surf = surface]() mutable { mContext->setSurface(std::move(surf)); });

void RenderProxy::setSurface(const sp<Surface>& surface, bool enableTimeout) {

    mRenderThread.queue().post([this, surf = surface, enableTimeout]() mutable {

        mContext->setSurface(std::move(surf), enableTimeout);

    });

}



void RenderProxy::allocateBuffers() {

libs/hwui/renderthread/RenderProxy.h

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ public: 
    ANDROID_API bool loadSystemProperties();

    ANDROID_API void setName(const char* name);



    ANDROID_API void setSurface(const sp<Surface>& surface);

    ANDROID_API void setSurface(const sp<Surface>& surface, bool enableTimeout = true);

    ANDROID_API void allocateBuffers();

    ANDROID_API bool pause();

    ANDROID_API void setStopped(bool stopped);