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

Commit d4f0e485 authored by Chavi Weingarten's avatar Chavi Weingarten Committed by Automerger Merge Worker
Browse files

Merge "Check for null parent when migrating SurfaceControl" into rvc-dev am: 9fa6e684 

Change-Id: I477077c431e6ff3814ac9ce74cfda06871f8f7e6
parents 5773df6b 9fa6e684

services/core/java/com/android/server/wm/WindowContainer.java

+15 −2
Original line number Diff line number Diff line
@@ -399,7 +399,11 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< 
    }



    void createSurfaceControl(boolean force) {

        setSurfaceControl(makeSurface().build());

        setInitialSurfaceControlProperties(makeSurface().build());

    }



    private void setInitialSurfaceControlProperties(SurfaceControl surfaceControl) {

        setSurfaceControl(surfaceControl);

        getPendingTransaction().show(mSurfaceControl);

        onSurfaceShown(getPendingTransaction());

        updateSurfacePosition();
@@ -423,7 +427,16 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< 
        // Clear the last position so the new SurfaceControl will get correct position

        mLastSurfacePosition.set(0, 0);



        createSurfaceControl(false /* force */);

        final SurfaceControl.Builder b = mWmService.makeSurfaceBuilder(null)

                .setContainerLayer()

                .setName(getName());



        setInitialSurfaceControlProperties(b.build());



        // If parent is null, the layer should be placed offscreen so reparent to null. Otherwise,

        // set to the available parent.

        t.reparent(mSurfaceControl, mParent == null ? null : mParent.getSurfaceControl());



        if (mLastRelativeToLayer != null) {

            t.setRelativeLayer(mSurfaceControl, mLastRelativeToLayer, mLastLayer);

        } else {