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

Commit 5f98cb4f 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

* commit '481355a4':
  Use privateFlags for the preserve geometry check
parents 9120998f 481355a4

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

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



                // 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.y = win.mAttrs.y;

                    attrs.width = win.mAttrs.width;