From c6c5d8dc5bb3802591670d000432531cbd60018e Mon Sep 17 00:00:00 2001
From: Jaewan Kim <jaewan@google.com>
Date: Fri, 22 Apr 2016 05:49:44 +0900
Subject: [PATCH] Fix NPE when WindowManagerDebugConfig.DEBUG_SCREENSHOT is
 true

Bug: 28410270
Change-Id: I547556bec20a756735edad1692c64d6bd5a13773
---
 .../core/java/com/android/server/wm/WindowManagerService.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index 80bf803354e4f..e09ec39c273a5 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -6280,9 +6280,11 @@ public class WindowManagerService extends IWindowManager.Stub
                         + maxLayer + " appToken=" + appToken);
                 for (int i = 0; i < windows.size(); i++) {
                     WindowState win = windows.get(i);
+                    WindowSurfaceController controller = win.mWinAnimator.mSurfaceController;
                     Slog.i(TAG_WM, win + ": " + win.mLayer
                             + " animLayer=" + win.mWinAnimator.mAnimLayer
-                            + " surfaceLayer=" + win.mWinAnimator.mSurfaceController.getLayer());
+                            + " surfaceLayer=" + ((controller == null)
+                                ? "null" : controller.getLayer()));
                 }
             }