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

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

Merge "Use ui::LayerStack"

parents 2ba398a3 989de3d4

cmds/bootanimation/BootAnimation.cpp

+6 −7
Original line number Diff line number Diff line
@@ -527,16 +527,15 @@ status_t BootAnimation::readyToRun() { 


        // In the case of multi-display, boot animation shows on the specified displays

        // in addition to the primary display

        auto ids = SurfaceComposerClient::getPhysicalDisplayIds();

        constexpr uint32_t LAYER_STACK = 0;

        for (auto id : physicalDisplayIds) {

        const auto ids = SurfaceComposerClient::getPhysicalDisplayIds();

        for (const auto id : physicalDisplayIds) {

            if (std::find(ids.begin(), ids.end(), id) != ids.end()) {

                sp<IBinder> token = SurfaceComposerClient::getPhysicalDisplayToken(id);

                if (token != nullptr)

                    t.setDisplayLayerStack(token, LAYER_STACK);

                if (const auto token = SurfaceComposerClient::getPhysicalDisplayToken(id)) {

                    t.setDisplayLayerStack(token, ui::DEFAULT_LAYER_STACK);

                }

            }

        t.setLayerStack(control, LAYER_STACK);

        }

        t.setLayerStack(control, ui::DEFAULT_LAYER_STACK);

    }



    t.setLayer(control, 0x40000000)

core/jni/android_view_SurfaceControl.cpp

+2 −2
Original line number Diff line number Diff line
@@ -814,7 +814,7 @@ static void nativeSetLayerStack(JNIEnv* env, jclass clazz, jlong transactionObj, 
    auto transaction = reinterpret_cast<SurfaceComposerClient::Transaction*>(transactionObj);



    SurfaceControl* const ctrl = reinterpret_cast<SurfaceControl *>(nativeObject);

    transaction->setLayerStack(ctrl, layerStack);

    transaction->setLayerStack(ctrl, ui::LayerStack::fromValue(layerStack));

}



static void nativeSetShadowRadius(JNIEnv* env, jclass clazz, jlong transactionObj,
@@ -1013,7 +1013,7 @@ static void nativeSetDisplayLayerStack(JNIEnv* env, jclass clazz, 


    {

        auto transaction = reinterpret_cast<SurfaceComposerClient::Transaction*>(transactionObj);

        transaction->setDisplayLayerStack(token, layerStack);

        transaction->setDisplayLayerStack(token, ui::LayerStack::fromValue(layerStack));

    }

}

libs/input/SpriteController.cpp

+2 −1
Original line number Diff line number Diff line
@@ -168,7 +168,8 @@ void SpriteController::doUpdateSprites() { 


        // If surface is a new one, we have to set right layer stack.

        if (update.surfaceChanged || update.state.dirty & DIRTY_DISPLAY_ID) {

            t.setLayerStack(update.state.surfaceControl, update.state.displayId);

            t.setLayerStack(update.state.surfaceControl,

                            ui::LayerStack::fromValue(update.state.displayId));

            needApplyTransaction = true;

        }

    }