commit 901a5975bb2ee30e11f565959c945f27350ef2c0
author Matt Buckley <mattbuckley@google.com> Mon Jul 25 19:32:27 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 25 19:32:27 2022 +0000
tree 609b1829e39344cc6812424c17cfc812868e2000
parent dc004b3f76236ce9188bd2089432d4b1f47161bd
parent 009487079366e7099891082a9baa8ee80815bda6

Merge "Disable early hint in SurfaceFlinger adpf cpu hints by default" into tm-qpr-dev

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 44645b5..14e5c69 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -6639,8 +6639,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::