commit 29e122b35c30c811943453cfb718bf839a737f22
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Mar 05 00:30:48 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 05 00:30:48 2020 +0000
tree 7ed076a6fbff49d4fbabfe4cba675d8435f3ff19
parent abb891a722ddbcb82f579d00e4f95c54b1bd0c13
parent 0a52509e8cdc6da93daab9c34fdbb63232fa8adf

Merge "ISurfaceComposer: boundary check input on CAPTURE_LAYERS" into rvc-dev

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 385a093..163a1c7 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -1074,7 +1074,9 @@
                                                            mUpcomingActiveConfig.configId.value(),
                                                            constraints, &outTimeline);
     if (status != NO_ERROR) {
-        LOG_ALWAYS_FATAL("setActiveConfigWithConstraints failed: %d", status);
+        // setActiveConfigWithConstraints may fail if a hotplug event is just about
+        // to be sent. We just log the error in this case.
+        ALOGW("setActiveConfigWithConstraints failed: %d", status);
         return false;
     }