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

2018-04-26 03:22:29 +00:00
parent 13d650d7cf 4c36b55fc5
commit 1072d0d18a
1 changed files with 4 additions and 0 deletions
--- 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;