Merge "Fix NPE in getCompatibleMagnificationSpecForWindow" into sc-dev

2021-02-14 05:09:35 +00:00
parent ca9dfbe54e 30869024f9
commit 555349760a
1 changed files with 2 additions and 2 deletions
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -7514,8 +7514,8 @@ public class WindowManagerService extends IWindowManager.Stub
                if (spec != null) {
                    result.setTo(spec);
                }
-                spec.scale *= windowState.mGlobalScale;
-                return spec;
+                result.scale *= windowState.mGlobalScale;
+                return result;
            }
        }