commit 40e9cce7eb6256b217d0e55bf76e41e9bb024eb4
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Aug 15 18:43:07 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 15 18:43:07 2017 +0000
tree a598dd90bb48f7f84687fe8da58de8125268b4b9
parent 50563050c608248bc9ba087839e6fd950fb1ed11
parent 9035d72c61868193b5630db16a71a0d208bc4666

Merge "Disable task snapshot when image size is invalid"

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

diff --git a/services/core/java/com/android/server/wm/TaskSnapshotController.java b/services/core/java/com/android/server/wm/TaskSnapshotController.java
index 940ad33..60e6c7c 100644
--- a/services/core/java/com/android/server/wm/TaskSnapshotController.java
+++ b/services/core/java/com/android/server/wm/TaskSnapshotController.java
@@ -204,7 +204,7 @@
         }
         final GraphicBuffer buffer = top.mDisplayContent.screenshotApplicationsToBuffer(top.token,
                 -1, -1, false, 1.0f, false, true);
-        if (buffer == null) {
+        if (buffer == null || buffer.getWidth() <= 1 || buffer.getHeight() <= 1) {
             return null;
         }
         return new TaskSnapshot(buffer, top.getConfiguration().orientation,