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

Commit c6c2e562 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

release-request-696ef4a1-3459-446f-a322-67e13926d505-for-git_oc-mr1-release-42... 

release-request-696ef4a1-3459-446f-a322-67e13926d505-for-git_oc-mr1-release-4290956 snap-temp-L88300000095517061

Change-Id: I24286e907a68b990c7235aec85f0495cd0c98a89
parents 95d73d54 dd09e994

core/java/android/app/Activity.java

+3 −1
Original line number Diff line number Diff line
@@ -761,6 +761,7 @@ public class Activity extends ContextThemeWrapper 
    boolean mStartedActivity;

    private boolean mDestroyed;

    private boolean mDoReportFullyDrawn = true;

    private boolean mRestoredFromBundle;

    /** true if the activity is going through a transient pause */

    /*package*/ boolean mTemporaryPause = false;

    /** true if the activity is being destroyed in order to recreate it with a new configuration */
@@ -1012,6 +1013,7 @@ public class Activity extends ContextThemeWrapper 
        if (mVoiceInteractor != null) {

            mVoiceInteractor.attachActivity(this);

        }

        mRestoredFromBundle = savedInstanceState != null;

        mCalled = true;

    }
@@ -1948,7 +1950,7 @@ public class Activity extends ContextThemeWrapper 
        if (mDoReportFullyDrawn) {

            mDoReportFullyDrawn = false;

            try {

                ActivityManager.getService().reportActivityFullyDrawn(mToken);

                ActivityManager.getService().reportActivityFullyDrawn(mToken, mRestoredFromBundle);

            } catch (RemoteException e) {

            }

        }

core/java/android/app/IActivityManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ interface IActivityManager { 
    boolean convertFromTranslucent(in IBinder token);

    boolean convertToTranslucent(in IBinder token, in Bundle options);

    void notifyActivityDrawn(in IBinder token);

    void reportActivityFullyDrawn(in IBinder token);

    void reportActivityFullyDrawn(in IBinder token, boolean restoredFromBundle);

    void restart();

    void performIdleMaintenance();

    void takePersistableUriPermission(in Uri uri, int modeFlags, int userId);

libs/hwui/BakedOpRenderer.cpp

+10 −4
Original line number Diff line number Diff line
@@ -208,7 +208,6 @@ void BakedOpRenderer::drawRects(const float* rects, int count, const SkPaint* pa 
    // TODO: Currently assume full FBO damage, due to FrameInfoVisualizer::unionDirty.

    // Should should scissor/set mHasDrawn safely.

    mRenderState.scissor().setEnabled(false);

    mHasDrawn = true;

    Glop glop;

    GlopBuilder(mRenderState, mCaches, &glop)

            .setRoundRectClipState(nullptr)
@@ -217,7 +216,11 @@ void BakedOpRenderer::drawRects(const float* rects, int count, const SkPaint* pa 
            .setTransform(Matrix4::identity(), TransformFlags::None)

            .setModelViewIdentityEmptyBounds()

            .build();

    mRenderState.render(glop, mRenderTarget.orthoMatrix);

    // Disable blending if this is the first draw to the main framebuffer, in case app has defined

    // transparency where it doesn't make sense - as first draw in opaque window.

    bool overrideDisableBlending = !mHasDrawn && mOpaque && !mRenderTarget.frameBufferId;

    mRenderState.render(glop, mRenderTarget.orthoMatrix, overrideDisableBlending);

    mHasDrawn = true;

}



// clears and re-fills stencil with provided rendertarget space quads,
@@ -234,7 +237,7 @@ void BakedOpRenderer::setupStencilQuads(std::vector<Vertex>& quadVertices, 
            .setTransform(Matrix4::identity(), TransformFlags::None)

            .setModelViewIdentityEmptyBounds()

            .build();

    mRenderState.render(glop, mRenderTarget.orthoMatrix);

    mRenderState.render(glop, mRenderTarget.orthoMatrix, false);

    mRenderState.stencil().enableTest(incrementThreshold);

}
@@ -346,7 +349,10 @@ void BakedOpRenderer::prepareRender(const Rect* dirtyBounds, const ClipBase* cli 
void BakedOpRenderer::renderGlopImpl(const Rect* dirtyBounds, const ClipBase* clip,

        const Glop& glop) {

    prepareRender(dirtyBounds, clip);

    mRenderState.render(glop, mRenderTarget.orthoMatrix);

    // Disable blending if this is the first draw to the main framebuffer, in case app has defined

    // transparency where it doesn't make sense - as first draw in opaque window.

    bool overrideDisableBlending = !mHasDrawn && mOpaque && !mRenderTarget.frameBufferId;

    mRenderState.render(glop, mRenderTarget.orthoMatrix, overrideDisableBlending);

    if (!mRenderTarget.frameBufferId) mHasDrawn = true;

}

libs/hwui/OpenGLReadback.cpp

+1 −1
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ inline CopyResult copyTextureInto(Caches& caches, RenderState& renderState, 
                .build();

        Matrix4 ortho;

        ortho.loadOrtho(destWidth, destHeight);

        renderState.render(glop, ortho);

        renderState.render(glop, ortho, false);



        // TODO: We should convert to linear space when the target is RGBA16F

        glReadPixels(0, 0, bitmap->width(), bitmap->height(), format,

libs/hwui/renderstate/Blend.cpp

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ void Blend::getFactors(SkBlendMode mode, ModeOrderSwap modeUsage, GLenum* outSrc 
}



void Blend::setFactors(GLenum srcMode, GLenum dstMode) {

    if (srcMode == GL_ZERO && dstMode == GL_ZERO) {

    if ((srcMode == GL_ZERO || srcMode == GL_ONE) && dstMode == GL_ZERO) {

        // disable blending

        if (mEnabled) {

            glDisable(GL_BLEND);