From 9f9d61fd6c16a9750bda19a0d0ebac1209d25ffd Mon Sep 17 00:00:00 2001
From: Jorim Jaggi <jjaggi@google.com>
Date: Tue, 17 Jan 2017 11:15:37 +0100
Subject: [PATCH] Readd missing null check

Test: adb shell am instrument -w -r
android.test.appsmoke/android.support.test.runner.AndroidJUnitRunner

Change-Id: I8f7c325cf73805ed7137792479f5f348c74f85e4
Fixes: 34333370
---
 services/core/java/com/android/server/wm/DisplayContent.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index 73bf3dc3e230..47003fa8c8de 100644
--- a/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -2112,6 +2112,9 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
             boolean wallpaperOnly, boolean includeDecor) {
         Bitmap bitmap = screenshotApplications(appToken, width, height, includeFullDisplay,
                 frameScale, wallpaperOnly, includeDecor, SurfaceControl::screenshot);
+        if (bitmap == null) {
+            return null;
+        }
 
         if (DEBUG_SCREENSHOT) {
             // TEST IF IT's ALL BLACK
-- 
2.11.0