commit c94756d4a9ae4639cd49a51c1f65cf392ca4d3d6
author Winson Chung <winsonc@google.com> Thu Oct 12 20:48:34 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 12 20:48:34 2017 +0000
tree aed1238f72720509546e2d148a5153afa6d4b44f
parent 9132969774c655f35c620a953b711fb55073105a
parent 44e1d4eb3cbe804111b61381e77f9c9b5c7d0690

Merge "Skip drawing snapshot if we can't create the buffer." into oc-mr1-dev
am: 44e1d4eb3c

Change-Id: Ia7e02905e030a1b3ef3841e5b77d49006b764b0f

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 6c11d8b..a1868e6 100644
--- a/services/core/java/com/android/server/wm/TaskSnapshotController.java
+++ b/services/core/java/com/android/server/wm/TaskSnapshotController.java
@@ -296,7 +296,9 @@
         decorPainter.drawDecors(c, null /* statusBarExcludeFrame */);
         node.end(c);
         final Bitmap hwBitmap = ThreadedRenderer.createHardwareBitmap(node, width, height);
-
+        if (hwBitmap == null) {
+            return null;
+        }
         return new TaskSnapshot(hwBitmap.createGraphicBufferHandle(),
                 topChild.getConfiguration().orientation, mainWindow.mStableInsets,
                 ActivityManager.isLowRamDeviceStatic() /* reduced */, 1.0f /* scale */);