commit f40c2d6255f45cc0cfcb6b213ca2e20840d63ec1
author NT Tsai <nttsai@google.com> Mon Jul 25 14:28:09 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jul 25 14:28:09 2022 +0000
tree cdef70459666a139acfbfab44177e2c1cd14916f
parent 80f78ab4e316dc3f9e3ec8881473b15e4666b897
parent 4830cd6ad9d045f6aefd134e41822c570067605d

Merge "Fail gracefully when allocating screenshot buffers" into tm-d1-dev am: 4830cd6ad9

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/19382466

Change-Id: Id8d4841a88903b92ed31bf88bbd015b9cbadce05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 6a17cd8..d6f665a 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -6620,8 +6620,13 @@
                                              1 /* layerCount */, usage, "screenshot");
 
     const status_t bufferStatus = buffer->initCheck();
-    LOG_ALWAYS_FATAL_IF(bufferStatus != OK, "captureScreenCommon: Buffer failed to allocate: %d",
-                        bufferStatus);
+    if (bufferStatus != OK) {
+        // Animations may end up being really janky, but don't crash here.
+        // Otherwise an irreponsible process may cause an SF crash by allocating
+        // too much.
+        ALOGE("%s: Buffer failed to allocate: %d", __func__, bufferStatus);
+        return ftl::yield<FenceResult>(base::unexpected(bufferStatus)).share();
+    }
     const std::shared_ptr<renderengine::ExternalTexture> texture = std::make_shared<
             renderengine::impl::ExternalTexture>(buffer, getRenderEngine(),
                                                  renderengine::impl::ExternalTexture::Usage::