commit e7a2ecfac49bc8a546a5167b4a5b7598e7a8cfd3
author android-build-team Robot <android-build-team-robot@google.com> Tue Jul 14 23:08:18 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue Jul 14 23:08:18 2020 +0000
tree 50b99c4ffca0c40245fbd42f45dec7391a1a7eba
parent 4a79773e31395b7359a1892b3822024e5800f6dd
parent a2fe15bf96c8bb88c174ac61eab6c013a04332c4

Snap for 6680110 from a2fe15bf96c8bb88c174ac61eab6c013a04332c4 to rvc-qpr1-release

Change-Id: I162a63c8a378f83ea74b7bab02a81b86b7734b2c

suspend/1.0/default/SuspendControlService.cpp

diff --git a/suspend/1.0/default/SuspendControlService.cpp b/suspend/1.0/default/SuspendControlService.cpp
index 2a4748b..671f3dd 100644
--- a/suspend/1.0/default/SuspendControlService.cpp
+++ b/suspend/1.0/default/SuspendControlService.cpp
@@ -18,6 +18,7 @@
 
 #include <android-base/logging.h>
 #include <android-base/stringprintf.h>
+#include <signal.h>
 
 #include "SystemSuspend.h"
 
@@ -29,6 +30,10 @@
 namespace suspend {
 namespace V1_0 {
 
+static void register_sig_handler() {
+    signal(SIGPIPE, SIG_IGN);
+}
+
 template <typename T>
 binder::Status retOk(const T& value, T* ret_val) {
     *ret_val = value;
@@ -113,6 +118,8 @@
 }
 
 status_t SuspendControlService::dump(int fd, const Vector<String16>& args) {
+    register_sig_handler();
+
     const auto suspendService = mSuspend.promote();
     if (!suspendService) {
         return DEAD_OBJECT;