From 4c36b55fc53b1d5f29fe530c00992f6be5c46e3e Mon Sep 17 00:00:00 2001
From: Yuki Awano <yawano@google.com>
Date: Tue, 24 Apr 2018 17:27:50 +0900
Subject: [PATCH] Do not magnify if surface control is not set

Bug: 77938723
Test: None
Change-Id: I93fc306bf6287016ba86b4404507df4ae926dcad
---
 services/core/java/com/android/server/wm/WindowContainer.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/services/core/java/com/android/server/wm/WindowContainer.java b/services/core/java/com/android/server/wm/WindowContainer.java
index eab391ed74ce9..19c5a3d6452a9 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 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
      * @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;