commit 3cc360595441ae39db66a36ae9c51aef80cdd457
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 04 17:30:06 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 04 17:30:06 2020 +0000
tree 4a32219e558b44eb3e45ee20c13367735e1a9ee9
parent cda64005d413de64ea29a9e41603da0a384eb0c7
parent 9ee812fdc9054fba948a42cb2f1cbf2361d38e89

Merge "Disallow shrinking threadpool size once started." am: 70f592a6cf am: 9ee812fdc9

Change-Id: Ibce7421a8984e3aef071463c72f59dad5339b655

libs/binder/ProcessState.cpp

diff --git a/libs/binder/ProcessState.cpp b/libs/binder/ProcessState.cpp
index 4b773e8..f3861bb 100644
--- a/libs/binder/ProcessState.cpp
+++ b/libs/binder/ProcessState.cpp
@@ -328,6 +328,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;