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

Commit da0dbcdb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove call to setLayerStack for BlackFrame Surface"

parents 9711bbdd deb69378

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

+0 −1
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ public class BlackFrame { 
                    .setParent(surfaceControl)

                    .build();

            transaction.setWindowCrop(surface, w, h);

            transaction.setLayerStack(surface, dc.getDisplayId());

            transaction.setAlpha(surface, 1);

            transaction.setLayer(surface, layer);

            transaction.setPosition(surface, left, top);

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

+1 −2
Original line number Diff line number Diff line
@@ -121,8 +121,7 @@ class Watermark { 
                    .setBufferSize(1, 1)

                    .setFormat(PixelFormat.TRANSLUCENT)

                    .build();

            t.setLayerStack(ctrl, mDisplay.getLayerStack())

                    .setLayer(ctrl, WindowManagerService.TYPE_LAYER_MULTIPLIER * 100)

            t.setLayer(ctrl, WindowManagerService.TYPE_LAYER_MULTIPLIER * 100)

                    .setPosition(ctrl, 0, 0)

                    .show(ctrl);

            mSurface.copyFrom(ctrl);