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

Commit f4563b57 authored by Johan Redestig's avatar Johan Redestig Committed by android-build-merger
Browse files

Merge "Use privateFlags for the preserve geometry check" into nyc-dev am: 481355a4 

am: 5f98cb4f

* commit '5f98cb4f':
  Use privateFlags for the preserve geometry check
parents 0f4fed67 5f98cb4f

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -2626,7 +2626,8 @@ public class WindowManagerService extends IWindowManager.Stub 
                }

                }





                // Odd choice but less odd than embedding in copyFrom()

                // Odd choice but less odd than embedding in copyFrom()

                if ((attrs.flags & WindowManager.LayoutParams.PRIVATE_FLAG_PRESERVE_GEOMETRY) != 0) {

                if ((attrs.privateFlags & WindowManager.LayoutParams.PRIVATE_FLAG_PRESERVE_GEOMETRY)

                        != 0) {

                    attrs.x = win.mAttrs.x;

                    attrs.x = win.mAttrs.x;

                    attrs.y = win.mAttrs.y;

                    attrs.y = win.mAttrs.y;

                    attrs.width = win.mAttrs.width;

                    attrs.width = win.mAttrs.width;