commit 0872c2455e896c9238014efb4d739c62a8103b74
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jan 17 14:01:17 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 17 14:01:21 2017 +0000
tree 18ed81488f83027630fda65ef7f1feb97d268ac8
parent 92d053b459513dc15bc3cb349a6a11cf2798a4c1
parent 9f9d61fd6c16a9750bda19a0d0ebac1209d25ffd

Merge "Readd missing null check"

services/core/java/com/android/server/wm/DisplayContent.java

diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index 73bf3dc..47003fa8 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 @@
             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