From 9698646efeebfbe69099341dd1d93e2150b4794b Mon Sep 17 00:00:00 2001
From: Arthur Hung <arthurhung@google.com>
Date: Tue, 10 Mar 2020 18:34:56 +0800
Subject: [PATCH] Fix magnifier border isn't fixed when magnification is
 working

Overlay layer had been replaced by NonAppWindowContainers which should
ignore the magnify checking while apply the MagnificationSpec.

Bug: 147336371
Test: manual, enable magnifier and move
Change-Id: I83ee5f83dc2e018c934a94fd1f8f11f90402c1eb
---
 .../core/java/com/android/server/wm/DisplayContent.java     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index 55ce84eb213b5..98b1f0a7baf35 100644
--- a/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -4931,6 +4931,12 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
                 scheduleAnimation();
             }
         }
+
+        @Override
+        boolean shouldMagnify() {
+            // Omitted from Screen-Magnification
+            return false;
+        }
     }
 
     /**