commit 1fdb98baf21fe39541f613e30f6385a76e19735c
author Steven Moreland <smoreland@google.com> Fri Mar 06 21:42:12 2020 +0000
committer Steven Moreland <smoreland@google.com> Sat Mar 07 00:04:06 2020 +0000
tree 5dfe31d9b01b53629ceff913a6e022523701a005
parent 0a09c76c713ded94ab38e6917402251977923baf

Reland "Disallow shrinking threadpool size once started."

This reverts commit 0a09c76c713ded94ab38e6917402251977923baf.

Bug: 147699567
Test: atest LibStatsPullTests now passes
Reason for revert: b/150904425 is fixed.

Change-Id: I00451b5f146dbb9086d395a8bf50e5929a6b7839

libs/binder/ProcessState.cpp

diff --git a/libs/binder/ProcessState.cpp b/libs/binder/ProcessState.cpp
index c0f5e31..6627618 100644
--- a/libs/binder/ProcessState.cpp
+++ b/libs/binder/ProcessState.cpp
@@ -324,6 +324,8 @@
 }
 
 status_t ProcessState::setThreadPoolMaxThreadCount(size_t maxThreads) {
+    LOG_ALWAYS_FATAL_IF(mThreadPoolStarted && maxThreads < mMaxThreads,
+           "Binder threadpool cannot be shrunk after starting");
     status_t result = NO_ERROR;
     if (ioctl(mDriverFD, BINDER_SET_MAX_THREADS, &maxThreads) != -1) {
         mMaxThreads = maxThreads;