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

Commit 53a8ebbf authored by Robert Carr's avatar Robert Carr Committed by android-build-merger
Browse files

Merge "Ensure getParentSurfaceControl and getSurfaceControl return valid or... 

Merge "Ensure getParentSurfaceControl and getSurfaceControl return valid or null SC" into qt-dev am: ce3cd94e
am: dbf956b6

Change-Id: I5daab99b2094b6ddd8d345b442f628a55e2170b0
parents e44a03dd dbf956b6

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -130,6 +130,7 @@ class Dimmer { 
            mSurfaceAnimator = new SurfaceAnimator(dimAnimatable, () -> {

            mSurfaceAnimator = new SurfaceAnimator(dimAnimatable, () -> {

                if (!mDimming) {

                if (!mDimming) {

                    dimAnimatable.getPendingTransaction().remove(mDimLayer);

                    dimAnimatable.getPendingTransaction().remove(mDimLayer);

                    mDimLayer = null;

                }

                }

            }, mHost.mWmService);

            }, mHost.mWmService);

        }

        }

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -410,11 +410,13 @@ class SurfaceAnimator { 




        /**

        /**

         * @return The surface of the object to be animated.

         * @return The surface of the object to be animated.

         *         This SurfaceControl must be valid if non-null.

         */

         */

        @Nullable SurfaceControl getSurfaceControl();

        @Nullable SurfaceControl getSurfaceControl();





        /**

        /**

         * @return The parent of the surface object to be animated.

         * @return The parent of the surface object to be animated.

         *         This SurfaceControl must be valid if non-null.

         */

         */

        @Nullable SurfaceControl getParentSurfaceControl();

        @Nullable SurfaceControl getParentSurfaceControl();

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -93,6 +93,7 @@ class TaskScreenshotAnimatable implements SurfaceAnimator.Animatable { 
    @Override

    @Override

    public void onAnimationLeashDestroyed(SurfaceControl.Transaction t) {

    public void onAnimationLeashDestroyed(SurfaceControl.Transaction t) {

        t.remove(mSurfaceControl);

        t.remove(mSurfaceControl);

        mSurfaceControl = null;

    }

    }





    @Override

    @Override

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

+8 −1
Original line number Original line Diff line number Diff line
@@ -1003,7 +1003,10 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< 
        return p.makeChildSurface(child)

        return p.makeChildSurface(child)

                .setParent(mSurfaceControl);

                .setParent(mSurfaceControl);

    }

    }



    /*

     * @return The SurfaceControl parent for this containers SurfaceControl.

     *         The SurfaceControl must be valid if non-null.

     */

    @Override

    @Override

    public SurfaceControl getParentSurfaceControl() {

    public SurfaceControl getParentSurfaceControl() {

        final WindowContainer parent = getParent();

        final WindowContainer parent = getParent();
@@ -1210,6 +1213,10 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer< 
        }

        }

    }

    }





    /**

     * @return The SurfaceControl for this container.

     *         The SurfaceControl must be valid if non-null.

     */

    @Override

    @Override

    public SurfaceControl getSurfaceControl() {

    public SurfaceControl getSurfaceControl() {

        return mSurfaceControl;

        return mSurfaceControl;