Merge "Revert "libbinder: stopProcess: directly stop process"" into main

Treehugger Robot · Android (Google) Code Review · commit 4f9c5794f3c1 · 2025-01-27T19:17:01.000-08:00
diff --git a/libs/binder/IPCThreadState.cpp b/libs/binder/IPCThreadState.cpp
@@ -853,8 +853,12 @@ status_t IPCThreadState::handlePolledCommands()
 
 void IPCThreadState::stopProcess(bool /*immediate*/)
 {
-    ALOGI("IPCThreadState::stopProcess() (deprecated) called. Exiting process.");
-    exit(0);
+    //ALOGI("**** STOPPING PROCESS");
+    (void)flushCommands();
+    int fd = mProcess->mDriverFD;
+    mProcess->mDriverFD = -1;
+    close(fd);
+    //kill(getpid(), SIGKILL);
 }
 
 status_t IPCThreadState::transact(int32_t handle,

Original file line number	Diff line number	Diff line change
`@@ -853,8 +853,12 @@ status_t IPCThreadState::handlePolledCommands()`
`853`	`853`
`854`	`854`	`void IPCThreadState::stopProcess(bool /immediate/)`
`855`	`855`	`{`
`856`		`- ALOGI("IPCThreadState::stopProcess() (deprecated) called. Exiting process.");`
`857`		`- exit(0);`
	`856`	`+ //ALOGI("**** STOPPING PROCESS");`
	`857`	`+ (void)flushCommands();`
	`858`	`+ int fd = mProcess->mDriverFD;`
	`859`	`+ mProcess->mDriverFD = -1;`
	`860`	`+ close(fd);`
	`861`	`+ //kill(getpid(), SIGKILL);`
`858`	`862`	`}`
`859`	`863`
`860`	`864`	`status_t IPCThreadState::transact(int32_t handle,`