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

Commit cea9746e authored by Pablo Gamito's avatar Pablo Gamito Committed by Android (Google) Code Review
Browse files

Merge changes from topic "presubmit-am-c4d8ef327dd44e5daddb1982f2951a6b" into sc-v2-dev-plus-aosp 

* changes:
  [automerge] Don't increment colorLayerCounter on surface migration 2p: 6a1d698a
  Don't increment colorLayerCounter on surface migration
parents ea758134 d789bf9b

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

+12 −2
Original line number Diff line number Diff line
@@ -971,9 +971,19 @@ final class TaskDisplayArea extends DisplayArea<WindowContainer> { 
    }



    void setBackgroundColor(@ColorInt int colorInt) {

        setBackgroundColor(colorInt, false /* restore */);

    }



    void setBackgroundColor(@ColorInt int colorInt, boolean restore) {

        mBackgroundColor = colorInt;

        Color color = Color.valueOf(colorInt);



        // We don't want to increment the mColorLayerCounter if we are restoring the background

        // color after a surface migration because in that case the mColorLayerCounter already

        // accounts for setting that background color.

        if (!restore) {

            mColorLayerCounter++;

        }



        // Only apply the background color if the TDA is actually attached and has a valid surface

        // to set the background color on. We still want to keep track of the background color state
@@ -1002,7 +1012,7 @@ final class TaskDisplayArea extends DisplayArea<WindowContainer> { 
        super.migrateToNewSurfaceControl(t);



        if (mColorLayerCounter > 0) {

            setBackgroundColor(mBackgroundColor);

            setBackgroundColor(mBackgroundColor, true /* restore */);

        }



        // As TaskDisplayArea is getting a new surface, reparent and reorder the child surfaces.