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

Commit f040e3b5 authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Merge "Skip some unnecessary allocations" into sc-dev am: 839b9a11 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14208579

Change-Id: Ifcb8d2bf971cf8ff4355caa11c057824bec0be6b
parents 838809d8 839b9a11

core/java/android/view/SyncRtSurfaceTransactionApplier.java

+4 −4
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ public class SyncRtSurfaceTransactionApplier { 
             * @return this Builder

             */

            public Builder withMatrix(Matrix matrix) {

                this.matrix = matrix;

                this.matrix = new Matrix(matrix);

                flags |= FLAG_MATRIX;

                return this;

            }
@@ -201,7 +201,7 @@ public class SyncRtSurfaceTransactionApplier { 
             * @return this Builder

             */

            public Builder withWindowCrop(Rect windowCrop) {

                this.windowCrop = windowCrop;

                this.windowCrop = new Rect(windowCrop);

                flags |= FLAG_WINDOW_CROP;

                return this;

            }
@@ -272,8 +272,8 @@ public class SyncRtSurfaceTransactionApplier { 
            this.flags = params;

            this.surface = surface;

            this.alpha = alpha;

            this.matrix = new Matrix(matrix);

            this.windowCrop = new Rect(windowCrop);

            this.matrix = matrix;

            this.windowCrop = windowCrop;

            this.layer = layer;

            this.cornerRadius = cornerRadius;

            this.backgroundBlurRadius = backgroundBlurRadius;

libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipTouchHandler.java

+1 −0
Original line number Diff line number Diff line
@@ -625,6 +625,7 @@ public class PipTouchHandler { 
            }



            mMenuController.handlePointerEvent(cloneEvent);

            cloneEvent.recycle();

        }



        return true;

packages/SystemUI/shared/src/com/android/systemui/shared/system/SyncRtSurfaceTransactionApplierCompat.java

+4 −4
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ public class SyncRtSurfaceTransactionApplierCompat { 
             * @return this Builder

             */

            public Builder withMatrix(Matrix matrix) {

                this.matrix = matrix;

                this.matrix = new Matrix(matrix);

                flags |= FLAG_MATRIX;

                return this;

            }
@@ -241,7 +241,7 @@ public class SyncRtSurfaceTransactionApplierCompat { 
             * @return this Builder

             */

            public Builder withWindowCrop(Rect windowCrop) {

                this.windowCrop = windowCrop;

                this.windowCrop = new Rect(windowCrop);

                flags |= FLAG_WINDOW_CROP;

                return this;

            }
@@ -324,8 +324,8 @@ public class SyncRtSurfaceTransactionApplierCompat { 
            this.flags = flags;

            this.surface = surface;

            this.alpha = alpha;

            this.matrix = new Matrix(matrix);

            this.windowCrop = windowCrop != null ? new Rect(windowCrop) : null;

            this.matrix = matrix;

            this.windowCrop = windowCrop;

            this.layer = layer;

            this.relativeTo = relativeTo;

            this.relativeLayer = relativeLayer;