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

Commit 0d4d2efa authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE in getCompatibleMagnificationSpecForWindow" into sc-dev am: 55534976 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9817b875c97519aa2ad42c0fe212f2f8c40f89ac
parents a269018f 55534976

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -7514,8 +7514,8 @@ public class WindowManagerService extends IWindowManager.Stub 
                if (spec != null) {

                if (spec != null) {

                    result.setTo(spec);

                    result.setTo(spec);

                }

                }

                spec.scale *= windowState.mGlobalScale;

                result.scale *= windowState.mGlobalScale;

                return spec;

                return result;

            }

            }

        }

        }