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

Commit 36b55bc2 authored by Huihong Luo's avatar Huihong Luo
Browse files

Sync with ISurfaceComposerClient changes 

ISurfaceComposerClient in libgui is migrated to AIDL interface.

Bug: 172002646
Test: atest libgui_test
Change-Id: I5301a710a84bcf90ca4a789e184748e889115045
parent 4fed9b45

libs/input/SpriteController.cpp

+1 −2
Original line number Diff line number Diff line
@@ -249,8 +249,7 @@ void SpriteController::doUpdateSprites() { 
                // Pass cursor metadata in the sprite surface so that when Android is running as a

                // client OS (e.g. ARC++) the host OS can get the requested cursor metadata and

                // update mouse cursor in the host OS.

                t.setMetadata(

                        update.state.surfaceControl, METADATA_MOUSE_CURSOR, p);

                t.setMetadata(update.state.surfaceControl, gui::METADATA_MOUSE_CURSOR, p);

            }



            int32_t surfaceLayer = mOverlayLayer + update.state.layer;

native/android/surface_control.cpp

+3 −6
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ ASurfaceControl* ASurfaceControl_createFromWindow(ANativeWindow* window, const c 
    Surface* surface = static_cast<Surface*>(window);

    sp<IBinder> parentHandle = surface->getSurfaceControlHandle();



    uint32_t flags = ISurfaceComposerClient::eFXSurfaceBufferState;

    int32_t flags = ISurfaceComposerClient::eFXSurfaceBufferState;

    sp<SurfaceControl> surfaceControl;

    if (parentHandle) {

        surfaceControl =
@@ -88,11 +88,8 @@ ASurfaceControl* ASurfaceControl_createFromWindow(ANativeWindow* window, const c 
                                      // Format is only relevant for buffer queue layers.

                                      PIXEL_FORMAT_UNKNOWN /* format */, flags, parentHandle);

    } else {

        surfaceControl =

                client->createWithSurfaceParent(String8(debug_name), 0 /* width */, 0 /* height */,

                                                // Format is only relevant for buffer queue layers.

                                                PIXEL_FORMAT_UNKNOWN /* format */, flags,

                                                static_cast<Surface*>(window));

        // deprecated, this should no longer be used

        surfaceControl = nullptr;

    }



    if (!surfaceControl) {