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

Commit 6fa9c5cd authored by Michael Wright's avatar Michael Wright Committed by Gerrit Code Review
Browse files

Merge "Make sure NaturalSurfaceLayout is consistent with SurfaceControl"

parents 3a87cb01 40d73a79

services/core/java/com/android/server/display/ColorFade.java

+8 −8
Original line number Diff line number Diff line
@@ -587,7 +587,6 @@ final class ColorFade { 
                    Slog.e(TAG, "Unable to create surface.", ex);

                    return false;

                }

            }



                mSurfaceControl.setLayerStack(mDisplayLayerStack);

                mSurfaceControl.setSize(mDisplayWidth, mDisplayHeight);
@@ -597,6 +596,7 @@ final class ColorFade { 
                mSurfaceLayout = new NaturalSurfaceLayout(mDisplayManagerInternal,

                        mDisplayId, mSurfaceControl);

                mSurfaceLayout.onDisplayTransaction();

            }

        } finally {

            SurfaceControl.closeTransaction();

        }