From dd5986e035920cf8718fe968171c455c6bac9702 Mon Sep 17 00:00:00 2001 From: Jorim Jaggi Date: Tue, 11 Apr 2017 15:50:19 -0700 Subject: [PATCH] Fix NPE in TaskSnapshotController Test: Pray Change-Id: Ie65f072b35fbf1a9a65caf5be48dabbb7abb6be8 Fixes: 36592724 --- .../java/com/android/server/wm/TaskSnapshotController.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/wm/TaskSnapshotController.java b/services/core/java/com/android/server/wm/TaskSnapshotController.java index 48b01f40fc65e..fbb826d5cb483 100644 --- a/services/core/java/com/android/server/wm/TaskSnapshotController.java +++ b/services/core/java/com/android/server/wm/TaskSnapshotController.java @@ -162,12 +162,15 @@ class TaskSnapshotController { if (top == null) { return null; } + final WindowState mainWindow = top.findMainWindow(); + if (mainWindow == null) { + return null; + } final GraphicBuffer buffer = top.mDisplayContent.screenshotApplicationsToBuffer(top.token, -1, -1, false, 1.0f, false, true); if (buffer == null) { return null; } - final WindowState mainWindow = top.findMainWindow(); return new TaskSnapshot(buffer, top.getConfiguration().orientation, minRect(mainWindow.mContentInsets, mainWindow.mStableInsets), false /* reduced */, 1f /* scale */);