commit 1072d0d18a8701e5fac0d7e545aed7a620f706b3
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Apr 26 03:22:29 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 26 03:22:29 2018 +0000
tree fd28797125f4892651f846ce6db5d0ff981653ae
parent 13d650d7cfbc328a3d02b9a252646252cacfac9e
parent 4c36b55fc53b1d5f29fe530c00992f6be5c46e3e

Merge "Do not magnify if surface control is not set" into pi-dev

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

diff --git a/services/core/java/com/android/server/wm/WindowContainer.java b/services/core/java/com/android/server/wm/WindowContainer.java
index eab391e..19c5a3d 100644
--- a/services/core/java/com/android/server/wm/WindowContainer.java
+++ b/services/core/java/com/android/server/wm/WindowContainer.java
@@ -922,6 +922,10 @@
      * @return Whether this WindowContainer should be magnified by the accessibility magnifier.
      */
     boolean shouldMagnify() {
+        if (mSurfaceControl == null) {
+            return false;
+        }
+
         for (int i = 0; i < mChildren.size(); i++) {
             if (!mChildren.get(i).shouldMagnify()) {
                 return false;