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

Commit 53966760 authored by Rob Carr's avatar Rob Carr Committed by Android (Google) Code Review
Browse files

Merge "Use new SurfaceFlinger transaction API."

parents 60d54878 e13b58e1

cmds/bootanimation/BootAnimation.cpp

+3 −3
Original line number Diff line number Diff line
@@ -260,9 +260,9 @@ status_t BootAnimation::readyToRun() { 
    sp<SurfaceControl> control = session()->createSurface(String8("BootAnimation"),

            dinfo.w, dinfo.h, PIXEL_FORMAT_RGB_565);



    SurfaceComposerClient::openGlobalTransaction();

    control->setLayer(0x40000000);

    SurfaceComposerClient::closeGlobalTransaction();

    SurfaceComposerClient::Transaction t;

    t.setLayer(control, 0x40000000)

        .apply();



    sp<Surface> s = control->getSurface();

core/java/android/view/SurfaceControl.java

+409 −129

File changed.

Preview size limit exceeded, changes collapsed.

core/jni/android_view_SurfaceControl.cpp

+175 −115

File changed.

Preview size limit exceeded, changes collapsed.

libs/hwui/tests/common/TestContext.cpp

+4 −4
Original line number Diff line number Diff line
@@ -81,10 +81,10 @@ void TestContext::createWindowSurface() { 
    mSurfaceControl = mSurfaceComposerClient->createSurface(String8("HwuiTest"),

            gDisplay.w, gDisplay.h, PIXEL_FORMAT_RGBX_8888);



    SurfaceComposerClient::openGlobalTransaction();

    mSurfaceControl->setLayer(0x7FFFFFF);

    mSurfaceControl->show();

    SurfaceComposerClient::closeGlobalTransaction();

    SurfaceComposerClient::Transaction t;

    t.setLayer(mSurfaceControl, 0x7FFFFFF)

            .show(mSurfaceControl)

            .apply();

    mSurface = mSurfaceControl->getSurface();

}

libs/input/SpriteController.cpp

+37 −65

File changed.

Preview size limit exceeded, changes collapsed.