Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Do not run /system/bin/logcat when running on the ActivityManager thread to avoid blocking the ActivityManager thread."

Browse Source
This commit is contained in:
Olivier Gaillard
2022-07-20 08:47:18 +00:00
committed by Android (Google) Code Review
parent 0d0edd2ee2 e927037d17
commit 4aa381dc49
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -8858,6 +8858,10 @@ public class ActivityManagerService extends IActivityManager.Stub
// Do the rest in a worker thread to avoid blocking the caller on I/O
// (After this point, we shouldn't access AMS internal data structures.)
//
// If process is null, we are being called from some internal code
// and may be about to die -- run this synchronously.
final boolean runSynchronously = process == null;
Thread worker = new Thread("Error dump: " + dropboxTag) {
@Override
public void run() {
@@ -8885,7 +8889,7 @@ public class ActivityManagerService extends IActivityManager.Stub
sb.append(crashInfo.stackTrace);
}
if (lines > 0) {
if (lines > 0 && !runSynchronously) {
sb.append("\n");
InputStreamReader input = null;
@@ -8917,9 +8921,7 @@ public class ActivityManagerService extends IActivityManager.Stub
}
};
if (process == null) {
// If process is null, we are being called from some internal code
// and may be about to die -- run this synchronously.
if (runSynchronously) {
final int oldMask = StrictMode.allowThreadDiskWritesMask();
try {
worker.run();